X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.h;h=e32202042733a6c3f32deae5bc515da2f64483c6;hp=80b3decf3cac89d10d6817cb343b462076e4d55f;hb=aa48dc0c96a29aeb4298ee0529c8020c8a318289;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232

diff --git a/errlog.h b/errlog.h
index 80b3decf..e3220204 100644
--- a/errlog.h
+++ b/errlog.h
@@ -1,6 +1,6 @@
 #ifndef ERRLOG_H_INCLUDED
 #define ERRLOG_H_INCLUDED
-#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.11 2002/03/06 23:02:57 jongfoster Exp $"
+#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.21 2008/12/14 15:46:22 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.h,v $
@@ -8,8 +8,8 @@
  * Purpose     :  Log errors to a designated destination in an elegant,
  *                printf-like fashion.
  *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                Privoxy team.  http://ijbswa.sourceforge.net
+ * Copyright   :  Written by and Copyright (C) 2001-2009 the SourceForge
+ *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and 
@@ -35,6 +35,42 @@
  *
  * Revisions   :
  *    $Log: errlog.h,v $
+ *    Revision 1.21  2008/12/14 15:46:22  fabiankeil
+ *    Give crunched requests their own log level.
+ *
+ *    Revision 1.20  2008/03/27 18:27:23  fabiankeil
+ *    Remove kill-popups action.
+ *
+ *    Revision 1.19  2007/10/14 14:12:41  fabiankeil
+ *    When in daemon mode, close stderr after the configuration file has been
+ *    parsed the first time. If logfile isn't set, stop logging. Fixes BR#897436.
+ *
+ *    Revision 1.18  2007/07/14 07:28:47  fabiankeil
+ *    Add translation function for JB_ERR_FOO codes.
+ *
+ *    Revision 1.17  2007/03/31 13:33:28  fabiankeil
+ *    Add alternative log_error() with timestamps
+ *    that contain milliseconds and without using
+ *    strcpy(), strcat() or sprintf().
+ *
+ *    Revision 1.16  2006/11/28 15:29:50  fabiankeil
+ *    Define LOG_LEVEL_REDIRECTS independently of
+ *    FEATURE_FAST_REDIRECTS. It is used by redirect{}
+ *    as well.
+ *
+ *    Revision 1.15  2006/07/18 14:48:46  david__schmidt
+ *    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ *    with what was really the latest development (the v_3_0_branch branch)
+ *
+ *    Revision 1.13.2.1  2002/08/05 17:57:06  oes
+ *    Cosmetic change
+ *
+ *    Revision 1.13  2002/03/26 22:29:54  swa
+ *    we have a new homepage!
+ *
+ *    Revision 1.12  2002/03/24 13:25:43  swa
+ *    name change related issues
+ *
  *    Revision 1.11  2002/03/06 23:02:57  jongfoster
  *    Removing tabs
  *
@@ -127,6 +163,7 @@ extern "C" {
 
 /* Debug level for errors */
 
+/* XXX: Should be renamed. */
 #define LOG_LEVEL_GPC        0x0001
 #define LOG_LEVEL_CONNECT    0x0002
 #define LOG_LEVEL_IO         0x0004
@@ -136,25 +173,24 @@ extern "C" {
 #define LOG_LEVEL_FORCE      0x0020
 #endif /* def FEATURE_FORCE_LOAD */
 #define LOG_LEVEL_RE_FILTER  0x0040
-#ifdef FEATURE_FAST_REDIRECTS
 #define LOG_LEVEL_REDIRECTS  0x0080
-#endif /* def FEATURE_FAST_REDIRECTS */
 #define LOG_LEVEL_DEANIMATE  0x0100
-
 #define LOG_LEVEL_CLF        0x0200 /* Common Log File format */
-#ifdef FEATURE_KILL_POPUPS
-#define LOG_LEVEL_POPUPS     0x0400 /* Kill Popups */
-#endif /* def FEATURE_KILL_POPUPS */
-
-#define LOG_LEVEL_CGI   0x0800 /* CGI / templates */
+#define LOG_LEVEL_CRUNCH     0x0400
+#define LOG_LEVEL_CGI        0x0800 /* CGI / templates */
 
 /* Following are always on: */
 #define LOG_LEVEL_INFO    0x1000
 #define LOG_LEVEL_ERROR   0x2000
 #define LOG_LEVEL_FATAL   0x4000 /* Exits after writing log */
 
-extern void init_error_log(const char *prog_name, const char *logfname, int debuglevel);
-extern void log_error(int loglevel, char *fmt, ...);
+extern void init_error_log(const char *prog_name, const char *logfname);
+extern void set_debug_level(int debuglevel);
+extern void disable_logging(void);
+extern void init_log_module(void);
+extern void show_version(const char *prog_name);
+extern void log_error(int loglevel, const char *fmt, ...);
+extern const char *jb_err_to_string(int error);
 
 /* Revision control strings from this header and associated .c file */
 extern const char errlog_rcs[];