Rename ijb_foo macros to privoxy_foo

diff --git a/filters.c b/filters.c
index d7861f0..d48b7e0 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.165 2012/02/29 19:34:04 fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.166 2012/03/04 11:50:32 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -360,7 +360,7 @@ int acl_addr(const char *aspec, struct access_control_addr *aca)
    if ((p = strchr(acl_spec, '/')) != NULL)
    {
       *p++ = '\0';
-      if (ijb_isdigit(*p) == 0)
+      if (privoxy_isdigit(*p) == 0)
       {
          freez(acl_spec);
          return(-1);

diff --git a/loadcfg.c b/loadcfg.c
index ac1675b..1fe2437 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.122 2012/03/04 11:47:21 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.123 2012/03/04 11:49:24 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -466,9 +466,9 @@ struct configuration_spec * load_config(void)
       /* Make sure the command field is lower case */
       for (p = cmd; *p; p++)
       {
-         if (ijb_isupper(*p))
+         if (privoxy_isupper(*p))
          {
-            *p = (char)ijb_tolower(*p);
+            *p = (char)privoxy_tolower(*p);
          }
       }
 

diff --git a/miscutil.c b/miscutil.c
index de423aa..1a614c1 100644 (file)
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,4 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.70 2012/03/04 11:48:34 fabiankeil Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.71 2012/03/04 11:48:54 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@ -177,13 +177,13 @@ int strcmpic(const char *s1, const char *s2)
 
    while (*s1 && *s2)
    {
-      if ( ( *s1 != *s2 ) && ( ijb_tolower(*s1) != ijb_tolower(*s2) ) )
+      if ( ( *s1 != *s2 ) && ( privoxy_tolower(*s1) != privoxy_tolower(*s2) ) )
       {
          break;
       }
       s1++, s2++;
    }
-   return(ijb_tolower(*s1) - ijb_tolower(*s2));
+   return(privoxy_tolower(*s1) - privoxy_tolower(*s2));
 
 }
 
@@ -210,7 +210,7 @@ int strncmpic(const char *s1, const char *s2, size_t n)
 
    while (*s1 && *s2)
    {
-      if ( ( *s1 != *s2 ) && ( ijb_tolower(*s1) != ijb_tolower(*s2) ) )
+      if ( ( *s1 != *s2 ) && ( privoxy_tolower(*s1) != privoxy_tolower(*s2) ) )
       {
          break;
       }
@@ -219,7 +219,7 @@ int strncmpic(const char *s1, const char *s2, size_t n)
 
       s1++, s2++;
    }
-   return(ijb_tolower(*s1) - ijb_tolower(*s2));
+   return(privoxy_tolower(*s1) - privoxy_tolower(*s2));
 
 }
 
@@ -245,7 +245,7 @@ char *chomp(char *string)
     * strip trailing whitespace
     */
    p = string + strlen(string);
-   while (p > string && ijb_isspace(*(p-1)))
+   while (p > string && privoxy_isspace(*(p-1)))
    {
       p--;
    }
@@ -255,7 +255,7 @@ char *chomp(char *string)
     * find end of leading whitespace
     */
    q = r = string;
-   while (*q && ijb_isspace(*q))
+   while (*q && privoxy_isspace(*q))
    {
       q++;
    }

diff --git a/parsers.c b/parsers.c
index 8ff0702..4dd2a5f 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -1,4 +1,4 @@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.240 2011/12/31 14:49:39 fabiankeil Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.241 2012/03/04 11:47:54 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.c,v $
@@ -770,11 +770,11 @@ static void normalize_lws(char *header)
 
    while (*p != '\0')
    {
-      if (ijb_isspace(*p) && ijb_isspace(*(p+1)))
+      if (privoxy_isspace(*p) && privoxy_isspace(*(p+1)))
       {
          char *q = p+1;
 
-         while (ijb_isspace(*q))
+         while (privoxy_isspace(*q))
          {
             q++;
          }
@@ -807,7 +807,7 @@ static void normalize_lws(char *header)
    }
 
    p = strchr(header, ':');
-   if ((p != NULL) && (p != header) && ijb_isspace(*(p-1)))
+   if ((p != NULL) && (p != header) && privoxy_isspace(*(p-1)))
    {
       /*
        * There's still space before the colon.
@@ -982,7 +982,7 @@ char *get_header_value(const struct list *header_list, const char *header_name)
              * Found: return pointer to start of value
              */
             ret = cur_entry->str + length;
-            while (*ret && ijb_isspace(*ret)) ret++;
+            while (*ret && privoxy_isspace(*ret)) ret++;
             return ret;
          }
       }
@@ -3758,7 +3758,7 @@ static jb_err server_set_cookie(struct client_state *csp, char **header)
       cur_tag = *header + 11;
 
       /* skip whitespace between "Set-Cookie:" and value */
-      while (*cur_tag && ijb_isspace(*cur_tag))
+      while (*cur_tag && privoxy_isspace(*cur_tag))
       {
          cur_tag++;
       }
@@ -3774,7 +3774,7 @@ static jb_err server_set_cookie(struct client_state *csp, char **header)
             next_tag++;
 
             /* skip whitespace ";" and start of tag */
-            while (*next_tag && ijb_isspace(*next_tag))
+            while (*next_tag && privoxy_isspace(*next_tag))
             {
                next_tag++;
             }

diff --git a/project.h b/project.h
index b52b0b8..f7142ad 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,7 +1,7 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
 /** Version string. */
-#define PROJECT_H_VERSION "$Id: project.h,v 1.173 2012/03/04 11:49:44 fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.174 2012/03/04 11:50:32 fabiankeil Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -167,11 +167,11 @@ typedef int jb_err;
  * some unspecified Solaris versions.
  * Note: Remember to #include <ctype.h> if you use these macros.
  */
-#define ijb_isdigit(__X) isdigit((int)(unsigned char)(__X))
-#define ijb_isupper(__X) isupper((int)(unsigned char)(__X))
-#define ijb_toupper(__X) toupper((int)(unsigned char)(__X))
-#define ijb_tolower(__X) tolower((int)(unsigned char)(__X))
-#define ijb_isspace(__X) isspace((int)(unsigned char)(__X))
+#define privoxy_isdigit(__X) isdigit((int)(unsigned char)(__X))
+#define privoxy_isupper(__X) isupper((int)(unsigned char)(__X))
+#define privoxy_toupper(__X) toupper((int)(unsigned char)(__X))
+#define privoxy_tolower(__X) tolower((int)(unsigned char)(__X))
+#define privoxy_isspace(__X) isspace((int)(unsigned char)(__X))
 
 /**
  * Use for statically allocated buffers if you have no other choice.