Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h events.c handlers.c misc.c setup.c
Log Message:
Trivial prototype cleanup.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -3 -r1.273 -r1.274
--- E.h 30 May 2004 13:09:15 -0000 1.273
+++ E.h 31 May 2004 19:47:34 -0000 1.274
@@ -2415,7 +2415,7 @@
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, ...);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- events.c 4 May 2004 19:04:27 -0000 1.67
+++ events.c 31 May 2004 19:47:34 -0000 1.68
@@ -64,7 +64,7 @@
"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
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/handlers.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- handlers.c 7 May 2004 15:18:06 -0000 1.39
+++ handlers.c 31 May 2004 19:47:34 -0000 1.40
@@ -235,7 +235,7 @@
"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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/misc.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- misc.c 7 May 2004 22:29:30 -0000 1.56
+++ misc.c 31 May 2004 19:47:34 -0000 1.57
@@ -50,7 +50,7 @@
"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 @@
"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 @@
}
int
-EExit(void *code)
+EExit(int exitcode)
{
- long exitcode = 0;
+ int i;
EDBUG(9, "EExit");
@@ -144,14 +144,16 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- setup.c 30 May 2004 15:15:24 -0000 1.127
+++ setup.c 31 May 2004 19:47:35 -0000 1.128
@@ -137,7 +137,7 @@
"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 @@
_("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 @@
_("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 @@
{
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 @@
"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 @@
"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);
}
}
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
