From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 21 Jul 2010 14:43:03 +0000 (+0000)
Subject: Rename jb_err_to_string()'s parameter to jb_error to prevent shadowing issues after... 
X-Git-Tag: v_3_0_17~120
X-Git-Url: http://www.privoxy.org/gitweb/%22https:/@default-cgi@/faq/static/developer-manual/@default-cgi@show-url-info?a=commitdiff_plain;h=51753df233f3f86913cb0b0c342e52f6b3b23ef9;p=privoxy.git

Rename jb_err_to_string()'s parameter to jb_error to prevent shadowing issues after the next commit.
---

diff --git a/errlog.c b/errlog.c
index 8bff395d..2ec5a808 100644
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.100 2010/01/03 12:37:14 fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.101 2010/06/13 12:24:49 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -950,14 +950,14 @@ void log_error(int loglevel, const char *fmt, ...)
  *                visible to all files that include errlog.h.
  *
  * Parameters  :
- *          1  :  error = a valid jb_err code
+ *          1  :  jb_error = a valid jb_err code
  *
  * Returns     :  A string with the jb_err translation
  *
  *********************************************************************/
-const char *jb_err_to_string(int error)
+const char *jb_err_to_string(int jb_error)
 {
-   switch (error)
+   switch (jb_error)
    {
       case JB_ERR_OK:
          return "Success, no error";
diff --git a/errlog.h b/errlog.h
index 9f4b1b3c..75ae4c2e 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.22 2009/02/09 21:21:15 fabiankeil Exp $"
+#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.23 2009/05/16 13:27:20 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.h,v $
@@ -69,7 +69,7 @@ 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);
+extern const char *jb_err_to_string(int jb_error);
 
 /* Revision control strings from this header and associated .c file */
 extern const char errlog_rcs[];