[prev in list] [next in list] [prev in thread] [next in thread] 

List:       privoxy-commits
Subject:    [privoxy-commits] current cgiedit.c,1.45,1.46
From:       noreply () sourceforge ! net
Date:       2006-12-27 18:44:54
Message-ID: E1Gzdln-0007Wc-0W () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/ijbswa/current
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20268

Modified Files:
	cgiedit.c 
Log Message:
Stop shadowing string.h's index().


Index: cgiedit.c
===================================================================
RCS file: /cvsroot/ijbswa/current/cgiedit.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- cgiedit.c	21 Dec 2006 12:57:48 -0000	1.45
+++ cgiedit.c	27 Dec 2006 18:44:52 -0000	1.46
@@ -42,6 +42,9 @@
  *
  * Revisions   :
  *    $Log$
+ *    Revision 1.46  2006/12/27 18:44:52  fabiankeil
+ *    Stop shadowing string.h's index().
+ *
  *    Revision 1.45  2006/12/21 12:57:48  fabiankeil
  *    Add config option "split-large-forms"
  *    to work around the browser bug reported
@@ -3090,7 +3093,7 @@
    {
       /* We have some entries in the filter list */
       char * result;
-      int index = 0;
+      int filter_identifier = 0;
       char * filter_template;
 
       err = template_load(csp, &filter_template, "edit-actions-for-url-filter", 0);
@@ -3148,7 +3151,7 @@
                }
 
                /* Generate a unique serial number */
-               snprintf(number, sizeof(number), "%x", index++);
+               snprintf(number, sizeof(number), "%x", filter_identifier++);
                number[sizeof(number) - 1] = '\0';
 
                line_exports = new_map();
@@ -3237,7 +3240,7 @@
    unsigned line_number;
    char target[1024];
    jb_err err;
-   int index;
+   int filter_identifier;
    const char * action_set_name;
    char ch;
    struct file_list * fl;
@@ -3281,9 +3284,9 @@
    get_string_param(parameters, "p", &action_set_name);
    if (action_set_name != NULL)
    {
-      for (index = 0; index < MAX_AF_FILES; index++)
+      for (filter_identifier = 0; filter_identifier < MAX_AF_FILES; filter_identifier++)
       {
-         if (((fl = csp->actions_list[index]) != NULL) && ((b = fl->f) != NULL))
+         if (((fl = csp->actions_list[filter_identifier]) != NULL) && ((b = fl->f) != NULL))
          {
             for (b = b->next; NULL != b; b = b->next)
             {
@@ -3324,7 +3327,7 @@
       cur_line->data.action->multi_remove_all[ACTION_MULTI_FILTER] = 0;
    }
 
-   for (index = 0; !err; index++)
+   for (filter_identifier = 0; !err; filter_identifier++)
    {
       char key_value[30];
       char key_name[30];
@@ -3332,9 +3335,9 @@
       char value;
 
       /* Generate the keys */
-      snprintf(key_value, sizeof(key_value), "filter_r%x", index);
+      snprintf(key_value, sizeof(key_value), "filter_r%x", filter_identifier);
       key_value[sizeof(key_value) - 1] = '\0';
-      snprintf(key_name, sizeof(key_name), "filter_n%x", index);
+      snprintf(key_name, sizeof(key_name), "filter_n%x", filter_identifier);
       key_name[sizeof(key_name) - 1] = '\0';
 
       err = get_string_param(parameters, key_name, &name);


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
ijbswa-commits mailing list
ijbswa-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ijbswa-commits
[prev in list] [next in list] [prev in thread] [next in thread]