Deleted config.h and pcrs/chartables.h because they are auto

[privoxy.git] / errlog.c

diff --git a/errlog.c b/errlog.c
index f994118..0aa139a 100644 (file)
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.3 2001/05/20 01:11:40 jongfoster Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.4 2001/05/21 19:32:54 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -33,6 +33,9 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.3 2001/05/20 01:11:40 jongfoster Ex
  *
  * Revisions   :
  *    $Log: errlog.c,v $
+ *    Revision 1.4  2001/05/21 19:32:54  jongfoster
+ *    Added another #ifdef _WIN_CONSOLE
+ *
  *    Revision 1.3  2001/05/20 01:11:40  jongfoster
  *    Added support for LOG_LEVEL_FATAL
  *    Renamed LOG_LEVEL_FRC to LOG_LEVEL_FORCE,
@@ -65,23 +68,23 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.3 2001/05/20 01:11:40 jongfoster Ex
 
 #ifdef _WIN32
 #include <windows.h>
-#ifndef _WIN_CONSOLE\r
+#ifndef _WIN_CONSOLE
 #include "w32log.h"
-#endif /* ndef _WIN_CONSOLE */\r
+#endif /* ndef _WIN_CONSOLE */
 #endif /* def _WIN32 */
 
 #include "errlog.h"
 #include "project.h"
 
 const char errlog_h_rcs[] = ERRLOG_H_VERSION;
-\r
-
-/*\r
- * LOG_LEVEL_FATAL, LOG_LEVEL_ERROR and LOG_LEVEL_INFO\r
- * cannot be turned off.  (There are some exceptional situations\r
- * where we need to get a message to the user).\r
- *\r
- * FIXME: Do we need LOG_LEVEL_INFO here?\r
+
+
+/*
+ * LOG_LEVEL_FATAL, LOG_LEVEL_ERROR and LOG_LEVEL_INFO
+ * cannot be turned off.  (There are some exceptional situations
+ * where we need to get a message to the user).
+ *
+ * FIXME: Do we need LOG_LEVEL_INFO here?
  */
 #define LOG_LEVEL_MINIMUM  (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO)
 
@@ -94,35 +97,35 @@ static char * logfilename = NULL;
 /* logging detail level.  */
 static int debug = LOG_LEVEL_MINIMUM;  
 
-static void fatal_error(const char * error_message);\r
-\r
-\r
-/*********************************************************************\r
- *\r
- * Function    :  fatal_error\r
- *\r
- * Description :  Displays a fatal error to standard error (or, on \r
- *                a WIN32 GUI, to a dialog box), and exits\r
- *                JunkBuster with status code 1.\r
- *\r
- * Parameters  :\r
- *          1  :  error_message = The error message to display.\r
- *\r
- * Returns     :  Does not return.\r
- *\r
- *********************************************************************/\r
-static void fatal_error(const char * error_message)\r
-{\r
-#if defined(_WIN32) && !defined(_WIN_CONSOLE)\r
-   MessageBox(NULL, error_message, "Internet JunkBuster Error", \r
-      MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);  \r
-#else /* if !defined(_WIN32) || defined(_WIN_CONSOLE) */\r
-   fputs(error_message, stderr);\r
-#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */\r
-\r
-   exit(1);\r
-}\r
-\r
+static void fatal_error(const char * error_message);
+
+
+/*********************************************************************
+ *
+ * Function    :  fatal_error
+ *
+ * Description :  Displays a fatal error to standard error (or, on 
+ *                a WIN32 GUI, to a dialog box), and exits
+ *                JunkBuster with status code 1.
+ *
+ * Parameters  :
+ *          1  :  error_message = The error message to display.
+ *
+ * Returns     :  Does not return.
+ *
+ *********************************************************************/
+static void fatal_error(const char * error_message)
+{
+#if defined(_WIN32) && !defined(_WIN_CONSOLE)
+   MessageBox(NULL, error_message, "Internet JunkBuster Error", 
+      MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);  
+#else /* if !defined(_WIN32) || defined(_WIN_CONSOLE) */
+   fputs(error_message, stderr);
+#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
+
+   exit(1);
+}
+
 
 /*********************************************************************
  *
@@ -158,7 +161,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel)
    if( logfname )
    {
       if( !(fp = fopen(logfname, "a")) )
-      {\r
+      {
          log_error(LOG_LEVEL_FATAL, "init_errlog(): can't open logfile: %s", logfname);
       }
 
@@ -212,12 +215,12 @@ void log_error(int loglevel, char *fmt, ...)
 
    switch (loglevel)
    {
-      case LOG_LEVEL_ERROR:\r
-         outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread);\r
-         break;\r
-      case LOG_LEVEL_FATAL:\r
-         outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread);\r
-         break;\r
+      case LOG_LEVEL_ERROR:
+         outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread);
+         break;
+      case LOG_LEVEL_FATAL:
+         outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread);
+         break;
       case LOG_LEVEL_GPC:
          outc = sprintf(outbuf, "IJB(%d) Request: ", this_thread);
          break;
@@ -227,15 +230,24 @@ void log_error(int loglevel, char *fmt, ...)
       case LOG_LEVEL_HEADER:
          outc = sprintf(outbuf, "IJB(%d) Header: ", this_thread);
          break;
-      case LOG_LEVEL_INFO:\r
-         outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread);\r
-         break;\r
+      case LOG_LEVEL_INFO:
+         outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread);
+         break;
+#ifdef PCRS
       case LOG_LEVEL_RE_FILTER:
          outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread);
          break;
+#endif /* def PCRS */
+#ifdef FORCE_LOAD
       case LOG_LEVEL_FORCE:
          outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread);
-         break;\r
+         break;
+#endif /* def FORCE_LOAD */
+#ifdef FAST_REDIRECTS
+      case LOG_LEVEL_REDIRECTS:
+         outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread);
+         break;
+#endif /* def FAST_REDIRECTS */
       default:
          outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
          break;
@@ -322,8 +334,8 @@ void log_error(int loglevel, char *fmt, ...)
                }
                fputs(outbuf, logfp);
                /* FIXME RACE HAZARD: should end critical section error_log_use here */
-               fatal_error(outbuf);\r
-               /* Never get here */\r
+               fatal_error(outbuf);
+               /* Never get here */
                break;
             }
             if (outc < BUFSIZ-1) 
@@ -390,8 +402,8 @@ void log_error(int loglevel, char *fmt, ...)
             }
             fputs(outbuf, logfp);
             /* FIXME RACE HAZARD: should end critical section error_log_use here */
-            fatal_error(outbuf);\r
-            /* Never get here */\r
+            fatal_error(outbuf);
+            /* Never get here */
             break;
 
       } /* switch( p ) */
@@ -436,14 +448,14 @@ void log_error(int loglevel, char *fmt, ...)
 
    fputs(outbuf, logfp);
 
-   if (loglevel == LOG_LEVEL_FATAL)\r
-   {\r
-      fatal_error(outbuf);\r
-      /* Never get here */\r
-   }\r
-\r
+   if (loglevel == LOG_LEVEL_FATAL)
+   {
+      fatal_error(outbuf);
+      /* Never get here */
+   }
+
    /* FIXME RACE HAZARD: should end critical section error_log_use here */
-\r
+
 #if defined(_WIN32) && !defined(_WIN_CONSOLE)
    /* Write to display */
    LogPutString(outbuf);