Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c events.c gnome.c ipc.c main.c
Log Message:
Trivial cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -3 -r1.367 -r1.368
--- E.h 13 Feb 2005 11:19:50 -0000 1.367
+++ E.h 13 Feb 2005 14:49:36 -0000 1.368
@@ -127,17 +127,6 @@
#define FILEPATH_LEN_MAX 4096
-/* This turns on E's internal stack tracking system for coarse debugging */
-/* and being able to trace E for profiling/optimisation purposes (which */
-/* believe it or not I'm actually doing) */
-/* #define DEBUG 1 */
-
-#ifdef DEBUG
-extern int call_level;
-extern char *call_stack[1024];
-
-#endif
-
#ifdef HAVE_SNPRINTF
#define Evsnprintf vsnprintf
#define Esnprintf snprintf
@@ -2316,6 +2305,7 @@
*/
extern const char e_wm_name[];
extern const char e_wm_version[];
+extern const char e_wm_date[];
extern Display *disp;
extern RealRoot RRoot;
extern VirtRoot VRoot;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -3 -r1.182 -r1.183
--- actions.c 28 Dec 2004 23:46:43 -0000 1.182
+++ actions.c 13 Feb 2005 14:49:37 -0000 1.183
@@ -21,7 +21,6 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "E.h"
-#include "timestamp.h"
static void
runApp(const char *exe, const char *params)
@@ -284,8 +283,7 @@
"Good luck. We hope you enjoy the software.\n" "\n"
"The Rasterman - [EMAIL PROTECTED]"
"Mandrake - [EMAIL PROTECTED]"
- "Kim Woelders - [EMAIL PROTECTED]"),
- ENLIGHTENMENT_VERSION, E_CHECKOUT_DATE);
+ "Kim Woelders - [EMAIL PROTECTED]"), e_wm_version, e_wm_date);
DialogItemTextSetText(di, buf);
DialogAddButton(d, _("OK"), NULL, 1);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- events.c 31 Jan 2005 18:52:16 -0000 1.75
+++ events.c 13 Feb 2005 14:49:37 -0000 1.76
@@ -592,22 +592,6 @@
ModulesSignal(ESIGNAL_IDLE, NULL);
}
-#ifdef DEBUG
-#define DBUG_STACKSTART \
- int save = call_level + 1;
-#define DBUG_STACKCHECK \
- if (save != call_level) { \
- fprintf (stderr, "Unstack error: ["); \
- for (save = 0; save < 4; ++ save) \
- fprintf (stderr, "%s%s", save ? ", " : "", call_stack[save]); \
- fprintf (stderr, "]\n"); \
- save = call_level; \
- }
-#else
-#define DBUG_STACKSTART
-#define DBUG_STACKCHECK
-#endif
-
/*
* This is the primary event loop. Everything that is going to happen in the
* window manager has to start here at some point. This is where all the
@@ -625,8 +609,6 @@
int fdsize;
int xfd, smfd;
- DBUG_STACKSTART;
-
smfd = GetSMfd();
xfd = ConnectionNumber(disp);
fdsize = MAX(xfd, smfd) + 1;
@@ -651,14 +633,10 @@
evq_num = 0;
count = EventsProcess(&evq_ptr, &evq_num);
- DBUG_STACKCHECK;
-
HandleDrawQueue();
XFlush(disp);
pcount = count;
- DBUG_STACKCHECK;
-
evq_num = 0;
count = EventsProcess(&evq_ptr, &evq_num);
@@ -674,8 +652,6 @@
evq_ptr = NULL;
}
- DBUG_STACKCHECK;
-
ModulesSignal(ESIGNAL_IDLE, NULL);
FD_ZERO(&fdset);
@@ -711,13 +687,9 @@
if ((smfd >= 0) && (count > 0) && (FD_ISSET(smfd, &fdset)))
ProcessICEMSGS();
- DBUG_STACKCHECK;
-
if ((!(FD_ISSET(xfd, &fdset))) && (qe) && (count == 0)
&& (((smfd >= 0) && (!(FD_ISSET(smfd, &fdset)))) || (smfd < 0)))
HandleTimerEvent();
-
- DBUG_STACKCHECK;
}
#if ENABLE_DEBUG_EVENTS
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/gnome.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- gnome.c 12 Feb 2005 16:16:29 -0000 1.42
+++ gnome.c 13 Feb 2005 14:49:37 -0000 1.43
@@ -688,7 +688,6 @@
GNOME_SetWMNameVer(void)
{
static Atom atom_set = 0, atom_set2 = 0;
- const char *wm_version = ENLIGHTENMENT_VERSION;
if (!atom_set)
atom_set = XInternAtom(disp, XA_WIN_WM_NAME, False);
@@ -697,7 +696,7 @@
if (!atom_set2)
atom_set2 = XInternAtom(disp, XA_WIN_WM_VERSION, False);
XChangeProperty(disp, VRoot.win, atom_set2, XA_STRING, 8, PropModeReplace,
- (unsigned char *)wm_version, strlen(wm_version));
+ (unsigned char *)e_wm_version, strlen(e_wm_version));
}
void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- ipc.c 13 Feb 2005 13:58:50 -0000 1.200
+++ ipc.c 13 Feb 2005 14:49:37 -0000 1.201
@@ -22,7 +22,6 @@
*/
#include <ctype.h>
#include "E.h"
-#include "timestamp.h"
#define SS(s) ((s) ? (s) : NoText)
static const char NoText[] = "-NONE-";
@@ -162,7 +161,7 @@
/* Should be elsewhere */
static void
-IPC_Border(const char *params, Client * c)
+IPC_Border(const char *params, Client * c __UNUSED__)
{
if (!params)
{
@@ -930,7 +929,7 @@
IPC_Version(const char *params __UNUSED__, Client * c __UNUSED__)
{
IpcPrintf(_("Enlightenment Version : %s\n" "code is current to : %s\n"),
- e_wm_version, E_CHECKOUT_DATE);
+ e_wm_version, e_wm_date);
}
#if !USE_LIBC_MALLOC
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- main.c 12 Feb 2005 16:42:36 -0000 1.111
+++ main.c 13 Feb 2005 14:49:38 -0000 1.112
@@ -36,17 +36,14 @@
#else
"enlightenment-" ENLIGHTENMENT_VERSION;
#endif
+const char e_wm_date[] = E_CHECKOUT_DATE;
+
Display *disp;
RealRoot RRoot;
VirtRoot VRoot;
EConf Conf;
EMode Mode;
-#ifdef DEBUG
-int call_level = 0;
-char *call_stack[1024];
-#endif
-
#ifdef USE_EXT_INIT_WIN
Window init_win_ext = None;
#endif
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
