Remove unused debug & function tracing infrastructure from utils.c

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

4 files changed, 0 insertions, 231 deletions

diff --git a/utils.c b/utils.c
index d4a78b7..3e045be 100644
--- a/utils.c
+++ b/utils.c
@@ -29,8 +29,6 @@
 #include	<ctype.h>
 #include	<stdlib.h>
 
-unsigned int debugFlags;
-
 /***====================================================================***/
 
 Opaque
@@ -87,118 +85,9 @@ uFree(Opaque ptr)
 }
 
 /***====================================================================***/
-/***                  FUNCTION ENTRY TRACKING                           ***/
-/***====================================================================***/
-
-static FILE *entryFile = NULL;
-
-int uEntryLevel;
-
-Boolean
-uSetEntryFile(const 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, const 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, const 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(const 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(const 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(const char *s, ...)
-{
-    va_list ap;
-
-    va_start(ap, s);
-    vfprintf(uDebugFile, s, ap);
-    fflush(uDebugFile);
-    va_end(ap);
-    return;
-}
-
-/***====================================================================***/
-
 static FILE *errorFile = NULL;
 
 Boolean
diff --git a/utils.h b/utils.h
index 73ad5eb..4eda6ed 100644
--- a/utils.h
+++ b/utils.h
@@ -137,117 +137,5 @@ extern char *uStringDup(const char *  /* s1 */);
 
 /***====================================================================***/
 
-#ifdef	ASSERTIONS_ON
-#define	uASSERT(where,why) \
-	{if (!(why)) uFatalError("assertion botched in %s ( why )\n",where);}
-#else
-#define	uASSERT(where,why)
-#endif
-
-/***====================================================================***/
-
-#ifndef DEBUG_VAR
-#define	DEBUG_VAR	debugFlags
-#endif
-
-extern
-unsigned int DEBUG_VAR;
-
-extern void uDebug(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
-extern void uDebugNOI(const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2); /* no indent */
-extern Boolean uSetDebugFile(const 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(const char *name);
-
-extern void uEntry(int l, const char *s, ...) _X_ATTRIBUTE_PRINTF(2,3);
-extern void uExit(int l, const char *rtVal);
-
-extern int uEntryLevel;
-
-#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))
-
-#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/xkbvleds.c b/xkbvleds.c
index 67e93c2..3b8cc97 100644
--- a/xkbvleds.c
+++ b/xkbvleds.c
@@ -36,8 +36,6 @@
 
 #define	OPAQUE_DEFINED
 #define	BOOLEAN_DEFINED
-#define	DEBUG_VAR_NOT_LOCAL
-#define	DEBUG_VAR debugFlags
 #include "utils.h"
 #include "LED.h"
 
@@ -213,8 +211,6 @@ main(int argc, char *argv[])
         NULL
     };
 
-    uSetEntryFile(NullString);
-    uSetDebugFile(NullString);
     uSetErrorFile(NullString);
     bzero(leds, XkbNumIndicators * sizeof(Widget));
     toplevel = XtOpenApplication(&app_con, "XkbLEDPanel", NULL, 0, &argc, argv,
diff --git a/xkbwatch.c b/xkbwatch.c
index 7db359a..e480590 100644
--- a/xkbwatch.c
+++ b/xkbwatch.c
@@ -36,8 +36,6 @@
 
 #define	OPAQUE_DEFINED
 #define	BOOLEAN_DEFINED
-#define	DEBUG_VAR_NOT_LOCAL
-#define	DEBUG_VAR debugFlags
 #include "utils.h"
 #include "LED.h"
 
@@ -82,8 +80,6 @@ main(int argc, char *argv[])
         NULL
     };
 
-    uSetEntryFile(NullString);
-    uSetDebugFile(NullString);
     uSetErrorFile(NullString);
     toplevel = XtOpenApplication(&app_con, "XkbWatch",
                                  options, XtNumber(options), &argc, argv,