- Don't claim HTTP/1.1 compliance.

[privoxy.git] / errlog.c

diff --git a/errlog.c b/errlog.c
index e9e8daa..d424381 100644 (file)
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.50 2007/04/11 10:55:44 fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.52 2007/07/14 07:28:47 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -33,6 +33,12 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.50 2007/04/11 10:55:44 fabiankeil E
  *
  * Revisions   :
  *    $Log: errlog.c,v $
+ *    Revision 1.52  2007/07/14 07:28:47  fabiankeil
+ *    Add translation function for JB_ERR_FOO codes.
+ *
+ *    Revision 1.51  2007/05/11 11:51:34  fabiankeil
+ *    Fix a type mismatch warning.
+ *
  *    Revision 1.50  2007/04/11 10:55:44  fabiankeil
  *    Enforce some assertions that could be triggered
  *    on mingw32 and other systems where we use threads
@@ -346,19 +352,19 @@ static char *os2_socket_strerr(int errcode, char *tmp_buf);
 #endif
 
 #ifdef FEATURE_PTHREAD
-static inline void lock_logfile()
+static inline void lock_logfile(void)
 {
    pthread_mutex_lock(&log_mutex);
 }
-static inline void unlock_logfile()
+static inline void unlock_logfile(void)
 {
    pthread_mutex_unlock(&log_mutex);
 }
-static inline void lock_loginit()
+static inline void lock_loginit(void)
 {
    pthread_mutex_lock(&log_init_mutex);
 }
-static inline void unlock_loginit()
+static inline void unlock_loginit(void)
 {
    pthread_mutex_unlock(&log_init_mutex);
 }
@@ -503,7 +509,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel)
  * Returns     :  thread_id
  *
  *********************************************************************/
-long get_thread_id(void)
+static long get_thread_id(void)
 {
    long this_thread = 1;  /* was: pthread_t this_thread;*/
 
@@ -673,7 +679,7 @@ static inline size_t get_clf_timestamp(char *buffer, size_t buffer_size)
  * Returns     :  Log level string.
  *
  *********************************************************************/
-inline const char *get_log_level_string(int loglevel)
+static inline const char *get_log_level_string(int loglevel)
 {
    char *log_level_string = NULL;
 
@@ -1507,6 +1513,48 @@ void log_error(int loglevel, const char *fmt, ...)
 #endif /* defined(USE_NEW_LOG_ERROR) */
 
 
+/*********************************************************************
+ *
+ * Function    :  jb_err_to_string
+ *
+ * Description :  Translates JB_ERR_FOO codes into strings.
+ *
+ *                XXX: the type of error codes is jb_err
+ *                but the typedef'inition is currently not
+ *                visible to all files that include errlog.h.
+ *
+ * Parameters  :
+ *          1  :  error = a valid jb_err code
+ *
+ * Returns     :  A string with the jb_err translation
+ *
+ *********************************************************************/
+const char *jb_err_to_string(int error)
+{
+   switch (error)
+   {
+      case JB_ERR_OK:
+         return "Success, no error";
+      case JB_ERR_MEMORY:
+         return "Out of memory";
+      case JB_ERR_CGI_PARAMS:
+         return "Missing or corrupt CGI parameters";
+      case JB_ERR_FILE:
+         return "Error opening, reading or writing a file";
+      case JB_ERR_PARSE:
+         return "Parse error";
+      case JB_ERR_MODIFIED:
+         return "File has been modified outside of the CGI actions editor.";
+      case JB_ERR_COMPRESS:
+         return "(De)compression failure";
+      default:
+         assert(0);
+         return "Unknown error";
+   }
+   assert(0);
+   return "Internal error";
+}
+
 #ifdef _WIN32
 /*********************************************************************
  *