From 7ca2572623fee8db916eff668ef3c852f2ce124a Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 26 May 2014 16:09:29 -0700 Subject: Remove unused debugging & function tracing frameworks Signed-off-by: Alan Coopersmith --- psgeom.c | 2 -- utils.c | 109 ------------------------------------------------------------- utils.h | 101 -------------------------------------------------------- xkbprint.c | 4 --- 4 files changed, 216 deletions(-) diff --git a/psgeom.c b/psgeom.c index 811d140..44f7994 100644 --- a/psgeom.c +++ b/psgeom.c @@ -44,8 +44,6 @@ #include #endif -#define DEBUG_VAR_NOT_LOCAL -#define DEBUG_VAR debugFlags #include #include "utils.h" diff --git a/utils.c b/utils.c index 7390c8e..877fe92 100644 --- a/utils.c +++ b/utils.c @@ -89,115 +89,6 @@ uFree(Opaque ptr) return; } -/***====================================================================***/ -/*** FUNCTION ENTRY TRACKING ***/ -/***====================================================================***/ - -static FILE * entryFile = NULL; -static int uEntryLevel; - -Boolean -uSetEntryFile(char *name) -{ - if ((entryFile != NULL) && (entryFile != stderr)) { - fprintf(entryFile, "switching to %s\n", name ? name : "stderr"); - fclose(entryFile); - } - if (name != NullString) - entryFile = fopen(name, "w"); - else - entryFile = stderr; - if (entryFile == NULL) { - entryFile = stderr; - return (False); - } - return (True); -} - -void -uEntry(int l, char *s, ...) -{ - int i; - va_list ap; - - va_start(ap, s); - for (i = 0; i < uEntryLevel; i++) { - putc(' ', entryFile); - } - vfprintf(entryFile, s, ap); - uEntryLevel += l; - va_end(ap); - return; -} - -void -uExit(int l, char *rtVal) -{ - int i; - - uEntryLevel -= l; - if (uEntryLevel < 0) - uEntryLevel = 0; - for (i = 0; i < uEntryLevel; i++) { - putc(' ', entryFile); - } - fprintf(entryFile, "---> 0x%p\n", rtVal); - return; -} - -/***====================================================================***/ -/*** PRINT FUNCTIONS ***/ -/***====================================================================***/ - -FILE *uDebugFile = NULL; -int uDebugIndentLevel = 0; -int uDebugIndentSize = 4; - -Boolean -uSetDebugFile(char *name) -{ - if ((uDebugFile != NULL) && (uDebugFile != stderr)) { - fprintf(uDebugFile, "switching to %s\n", name ? name : "stderr"); - fclose(uDebugFile); - } - if (name != NullString) - uDebugFile = fopen(name, "w"); - else - uDebugFile = stderr; - if (uDebugFile == NULL) { - uDebugFile = stderr; - return (False); - } - return (True); -} - -void -uDebug(char *s, ...) -{ - int i; - va_list ap; - - va_start(ap, s); - for (i = (uDebugIndentLevel * uDebugIndentSize); i > 0; i--) { - putc(' ', uDebugFile); - } - vfprintf(uDebugFile, s, ap); - fflush(uDebugFile); - va_end(ap); - return; -} - -void -uDebugNOI(char *s, ...) -{ - va_list ap; - - va_start(ap, s); - vfprintf(uDebugFile, s, ap); - fflush(uDebugFile); - va_end(ap); - return; -} /***====================================================================***/ diff --git a/utils.h b/utils.h index 7a54df6..36288f7 100644 --- a/utils.h +++ b/utils.h @@ -136,107 +136,6 @@ extern char *uStringDup(const char * /* s1 */); /***====================================================================***/ -#ifndef DEBUG_VAR -#define DEBUG_VAR debugFlags -#endif - -extern -unsigned int DEBUG_VAR; - -extern void uDebug(char *s, ...); -extern void uDebugNOI(char *s, ...); /* no indent */ -extern Boolean uSetDebugFile(char *name); -extern FILE *uDebugFile; -extern int uDebugIndentLevel; -extern int uDebugIndentSize; - -#define uDebugIndent(l) (uDebugIndentLevel+=(l)) -#define uDebugOutdent(l) (uDebugIndentLevel-=(l)) -#ifdef DEBUG_ON -#define uDEBUG(f,s) { if (DEBUG_VAR&(f)) uDebug(s);} -#define uDEBUG1(f,s,a) { if (DEBUG_VAR&(f)) uDebug(s,a);} -#define uDEBUG2(f,s,a,b) { if (DEBUG_VAR&(f)) uDebug(s,a,b);} -#define uDEBUG3(f,s,a,b,c) { if (DEBUG_VAR&(f)) uDebug(s,a,b,c);} -#define uDEBUG4(f,s,a,b,c,d) { if (DEBUG_VAR&(f)) uDebug(s,a,b,c,d);} -#define uDEBUG5(f,s,a,b,c,d,e) { if (DEBUG_VAR&(f)) uDebug(s,a,b,c,d,e);} -#define uDEBUG_NOI(f,s) { if (DEBUG_VAR&(f)) uDebug(s);} -#define uDEBUG_NOI1(f,s,a) { if (DEBUG_VAR&(f)) uDebugNOI(s,a);} -#define uDEBUG_NOI2(f,s,a,b) { if (DEBUG_VAR&(f)) uDebugNOI(s,a,b);} -#define uDEBUG_NOI3(f,s,a,b,c) { if (DEBUG_VAR&(f)) uDebugNOI(s,a,b,c);} -#define uDEBUG_NOI4(f,s,a,b,c,d) { if (DEBUG_VAR&(f)) uDebugNOI(s,a,b,c,d);} -#define uDEBUG_NOI5(f,s,a,b,c,d,e) { if (DEBUG_VAR&(f)) uDebugNOI(s,a,b,c,d,e);} -#else -#define uDEBUG(f,s) -#define uDEBUG1(f,s,a) -#define uDEBUG2(f,s,a,b) -#define uDEBUG3(f,s,a,b,c) -#define uDEBUG4(f,s,a,b,c,d) -#define uDEBUG5(f,s,a,b,c,d,e) -#define uDEBUG_NOI(f,s) -#define uDEBUG_NOI1(f,s,a) -#define uDEBUG_NOI2(f,s,a,b) -#define uDEBUG_NOI3(f,s,a,b,c) -#define uDEBUG_NOI4(f,s,a,b,c,d) -#define uDEBUG_NOI5(f,s,a,b,c,d,e) -#endif - -extern Boolean uSetEntryFile(char *name); -extern void uEntry(int l, char *s, ...); -extern void uExit(int l, char *rtVal); - -#ifdef ENTRY_TRACKING_ON -#define ENTRY_BIT 0x10 -#define LOW_ENTRY_BIT 0x1000 -#define ENTER (DEBUG_VAR&ENTRY_BIT) -#define FLAG(fLag) (DEBUG_VAR&(fLag)) - -extern int uEntryLevel; - -#define uENTRY(s) { if (ENTER) uEntry(1,s);} -#define uENTRY1(s,a) { if (ENTER) uEntry(1,s,a);} -#define uENTRY2(s,a,b) { if (ENTER) uEntry(1,s,a,b);} -#define uENTRY3(s,a,b,c) { if (ENTER) uEntry(1,s,a,b,c);} -#define uENTRY4(s,a,b,c,d) { if (ENTER) uEntry(1,s,a,b,c,d);} -#define uENTRY5(s,a,b,c,d,e) { if (ENTER) uEntry(1,s,a,b,c,d,e);} -#define uENTRY6(s,a,b,c,d,e,f) { if (ENTER) uEntry(1,s,a,b,c,d,e,f);} -#define uENTRY7(s,a,b,c,d,e,f,g) { if (ENTER) uEntry(1,s,a,b,c,d,e,f,g);} -#define uRETURN(v) { if (ENTER) uEntryLevel--; return(v); } -#define uVOIDRETURN { if (ENTER) uEntryLevel--; return; } - -#define uFLAG_ENTRY(w,s) { if (FLAG(w)) uEntry(0,s);} -#define uFLAG_ENTRY1(w,s,a) { if (FLAG(w)) uEntry(0,s,a);} -#define uFLAG_ENTRY2(w,s,a,b) { if (FLAG(w)) uEntry(0,s,a,b);} -#define uFLAG_ENTRY3(w,s,a,b,c) { if (FLAG(w)) uEntry(0,s,a,b,c);} -#define uFLAG_ENTRY4(w,s,a,b,c,d) { if (FLAG(w)) uEntry(0,s,a,b,c,d);} -#define uFLAG_ENTRY5(w,s,a,b,c,d,e) { if (FLAG(w)) uEntry(0,s,a,b,c,d,e);} -#define uFLAG_ENTRY6(w,s,a,b,c,d,e,f) { if (FLAG(w)) uEntry(0,s,a,b,c,d,e,f);} -#define uFLAG_ENTRY7(w,s,a,b,c,d,e,f,g) { if(FLAG(w))uEntry(0,s,a,b,c,d,e,f,g);} -#define uFLAG_RETURN(v) { return(v);} -#define uFLAG_VOIDRETURN { return; } -#else -#define uENTRY(s) -#define uENTRY1(s,a) -#define uENTRY2(s,a1,a2) -#define uENTRY3(s,a1,a2,a3) -#define uENTRY4(s,a1,a2,a3,a4) -#define uENTRY5(s,a1,a2,a3,a4,a5) -#define uENTRY6(s,a1,a2,a3,a4,a5,a6) -#define uENTRY7(s,a1,a2,a3,a4,a5,a6,a7) -#define uRETURN(v) { return(v); } -#define uVOIDRETURN { return; } - -#define uFLAG_ENTRY(f,s) -#define uFLAG_ENTRY1(f,s,a) -#define uFLAG_ENTRY2(f,s,a,b) -#define uFLAG_ENTRY3(f,s,a,b,c) -#define uFLAG_ENTRY4(f,s,a,b,c,d) -#define uFLAG_ENTRY5(f,s,a,b,c,d,e) -#define uFLAG_ENTRY6(f,s,a,b,c,d,e,g) -#define uFLAG_ENTRY7(f,s,a,b,c,d,e,g,h) -#define uFLAG_RETURN(v) { return(v);} -#define uFLAG_VOIDRETURN { return; } -#endif - _XFUNCPROTOEND #endif /* UTILS_H */ diff --git a/xkbprint.c b/xkbprint.c index a1b80db..3b55fbd 100644 --- a/xkbprint.c +++ b/xkbprint.c @@ -41,8 +41,6 @@ #include #endif -#define DEBUG_VAR_NOT_LOCAL -#define DEBUG_VAR debugFlags #include #include "utils.h" @@ -622,8 +620,6 @@ main(int argc, char *argv[]) int ok; XkbFileInfo result; - uSetEntryFile(NullString); - uSetDebugFile(NullString); uSetErrorFile(NullString); if (!parseArgs(argc, argv)) exit(1); -- cgit v1.2.3