* fixed naming crash with the new libcitadel

[citadel.git] / citadel / ecrash.c

diff --git a/citadel/ecrash.c b/citadel/ecrash.c
index a030842cdda96451683abef5946aa0b4a359d240..6a8ef3a0c1ce905151df7664d5f85ed6ec514474 100644 (file)
--- a/citadel/ecrash.c
+++ b/citadel/ecrash.c
@@ -13,6 +13,7 @@
  * vim: ts=4
  */
 
+#include "sysdep.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -23,7 +24,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <pthread.h>
+#include <libcitadel.h>
+#include "server.h"
 #include "sysdep_decls.h"
+#include "support.h"
+#include "config.h"
+#include "citserver.h"
 #include "ecrash.h"
 
 #define NIY()  printf("%s: Not Implemented Yet!\n", __FUNCTION__)
@@ -39,7 +45,7 @@ static int    gbl_backtraceDoneFlag = 0;
 static void *stack_frames[50];
 static size_t size, NThread;
 static char **strings;
-static char StrBuf[SIZ];
+static char StaticBuf[SIZ];
 
 /* 
  * Private structures for our thread list
@@ -168,11 +174,11 @@ static void outputPrintf(char *format, ...)
 
        if (enable_syslog)
        {
-               snprintf (StrBuf, SIZ, format, ap);
-               syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StrBuf);
+               snprintf (StaticBuf, SIZ, format, ap);
+               syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf);
        }
        else
-               lprintf(CTDL_EMERG, format, ap);
+               CtdlLogPrintf(CTDL_EMERG, format, ap);
 
 } // outputPrintf
 
@@ -192,22 +198,22 @@ static void createGlobalBacktrace( void )
        if (enable_syslog)
                for (NThread = 0; NThread < size; NThread++) 
                {
-                       snprintf (StrBuf, SIZ, "RAW: %p  ", stack_frames[NThread]);
-                       syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StrBuf);
+                       snprintf (StaticBuf, SIZ, "RAW: %p  ", stack_frames[NThread]);
+                       syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf);
                }
        else 
                for (NThread = 0; NThread < size; NThread++) 
-                       lprintf(1, "RAW: %p\n", stack_frames[NThread]);
+                       CtdlLogPrintf(1, "RAW: %p\n", stack_frames[NThread]);
        strings = backtrace_symbols(stack_frames, size);
        for (NThread = 0; NThread < size; NThread++) {
                if (strings != NULL) {
                        if (enable_syslog)
                        {// vsyslogs printf compliance sucks.
-                               snprintf (StrBuf, SIZ, "RAW: %p  ", strings[NThread]);
-                               syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StrBuf);
+                               snprintf (StaticBuf, SIZ, "RAW: %p  ", strings[NThread]);
+                               syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf);
                        }
                        else
-                               lprintf(1, "%s\n", strings[NThread]);
+                               CtdlLogPrintf(1, "%s\n", strings[NThread]);
                }
        }
 } /* createGlobalBacktrace */
@@ -218,12 +224,12 @@ static void outputRawtrace( void )
        if (enable_syslog)
                for (NThread = 0; NThread < size; NThread++) 
                {
-                       snprintf (StrBuf, SIZ, "RAW: %p  ", stack_frames[NThread]);
-                       syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StrBuf);
+                       snprintf (StaticBuf, SIZ, "RAW: %p  ", stack_frames[NThread]);
+                       syslog( LOG_CRIT|LOG_NDELAY|LOG_MAIL, StaticBuf);
                }
        else 
                for (NThread = 0; NThread < size; NThread++) 
-                       lprintf(1, "RAW: %p\n", stack_frames[NThread]);
+                       CtdlLogPrintf(1, "RAW: %p\n", stack_frames[NThread]);
 } /* createGlobalBacktrace */
 
 /*!