Trivial prototype cleanup.

SVN revision: 10399

eesh/E.h

@@ -100,7 +100,6 @@ typedef struct _root
 }
 Root;
 
-int                 EExit(void *code);
 void               *Emalloc(int size);
 void               *Erealloc(void *ptr, int size);
 void                Efree(void *ptr);

src/E.h

@@ -2415,7 +2415,7 @@ void                EDirUserSet(const char *d);
 char               *EDirUser(void);
 void                EDirUserCacheSet(const char *d);
 char               *EDirUserCache(void);
-int                 EExit(void *code);
+int                 EExit(int exitcode);
 void                Quicksort(void **a, int l, int r,
 			      int (*CompareFunc) (void *d1, void *d2));
 void                Eprintf(const char *fmt, ...);

src/events.c

@@ -64,7 +64,7 @@ EventsInit(void)
 		 "This is required for Enlightenment to run.\n" "\n"
 		 "Your Xserver probably is too old or mis-configured.\n" "\n"
 		 "Exiting.\n"));
-	EExit((void *)1);
+	EExit(1);
      }
 
 #ifdef USE_XRANDR

src/handlers.c

@@ -235,7 +235,7 @@ EHandleXError(Display * d, XErrorEvent * ev)
 		      "If your start-up files are highly customised this may not\n"
 		      "work.\n" "\n" "Are you ABSOLUTELY sure?\n"));
 	     AddE();
-	     EExit((void *)1);
+	     EExit(1);
 	  }
      }
 /*  XGetErrorText (disp, ev->error_code, buf, 63);

src/misc.c

@@ -50,7 +50,7 @@ BlumFlimFrub(void)
 		     "The reason this could be missing is due to badly created\n"
 		     "packages, someone manually deleting that program or perhaps\n"
 		     "an error in installing Enlightenment.\n"), s);
-	     EExit(NULL);
+	     EExit(0);
 	  }
 	if (!canexec(s))
 	  {
@@ -60,7 +60,7 @@ BlumFlimFrub(void)
 		     "This is a fatal error and Enlightenment will cease to run.\n"
 		     "Please rectify this situation and ensure it is installed\n"
 		     "correctly.\n"), s);
-	     EExit(NULL);
+	     EExit(0);
 	  }
      }
 }
@@ -114,9 +114,9 @@ EDirUserCache(void)
 }
 
 int
-EExit(void *code)
+EExit(int exitcode)
 {
-   long                exitcode = 0;
+   int                 i;
 
    EDBUG(9, "EExit");
 
@@ -144,14 +144,16 @@ EExit(void *code)
 
    if (Mode.wm.master)
      {
-	int                 i;
-
-	exitcode = (long)code;
 	SoundExit();
 	ThemeCleanup();
 	for (i = 0; i < child_count; i++)
 	   kill(e_children[i], SIGINT);
      }
+   else
+     {
+	exitcode = 0;
+     }
+
    Real_SaveSnapInfo(0, NULL);
 
    exit(exitcode);

src/setup.c

@@ -137,7 +137,7 @@ SetupX(void)
 		"xdm or startx first, or contact your local system\n"
 		"administrator, or Xserver vendor, or read the X, xdm and\n"
 		"startx manual pages before proceeding.\n"));
-	EExit((void *)1);
+	EExit(1);
      }
 
    VRoot.scr = DefaultScreen(disp);
@@ -235,7 +235,7 @@ SetupX(void)
 	       _("FATAL ERROR:\n" "\n"
 		 "Enlightenment is unable to initialise Imlib.\n" "\n"
 		 "This is unusual. Unable to continue.\n" "Exiting.\n"));
-	EExit((void *)1);
+	EExit(1);
      }
 #if USE_FNLIB
    pFnlibData = Fnlib_init(pImlib_Context);
@@ -246,7 +246,7 @@ SetupX(void)
 	       _("FATAL ERROR:\n" "\n"
 		 "Enlightenment is unable to initialise Fnlib.\n" "\n"
 		 "This is unusual. Unable to continue.\n" "Exiting.\n"));
-	EExit((void *)1);
+	EExit(1);
      }
 #endif
    VRoot.win = pImlib_Context->x.root;
@@ -453,7 +453,7 @@ ChkDir(char *d)
      {
 	Alert(_("The directory %s is apparently not a directory\n"
 		"This is a fatal condition.\n" "Please remove this file\n"), d);
-	EExit((void *)1);
+	EExit(1);
      }
    if (!canexec(d))
      {
@@ -461,14 +461,14 @@ ChkDir(char *d)
 		"This is a fatal condition.\n"
 		"Please check the ownership and permissions of this\n"
 		"directory and take steps to rectify this.\n"), d);
-	EExit((void *)1);
+	EExit(1);
      }
    if (!canread(d))
      {
 	Alert(_("Do not have read access to %s\n" "This is a fatal condition.\n"
 		"Please check the ownership and permissions of this\n"
 		"directory and take steps to rectify this.\n"), d);
-	EExit((void *)1);
+	EExit(1);
      }
    if (!canwrite(d))
      {
@@ -476,7 +476,7 @@ ChkDir(char *d)
 		"This is a fatal condition.\n"
 		"Please check the ownership and permissions of this\n"
 		"directory and take steps to rectify this.\n"), d);
-	EExit((void *)1);
+	EExit(1);
      }
 }