X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgiedit.c;h=f653b4e79a364ce218dc70fa1d25c35e39ba4c2a;hb=2522c86ee646a3ec3a1bcd04f25563b1516fa393;hp=6f68d6f639423ca55627f3284f3bf8bc08cee0e3;hpb=50f87c9446b435d47c371f63615260636639f450;p=privoxy.git

diff --git a/cgiedit.c b/cgiedit.c
index 6f68d6f6..f653b4e7 100644
--- a/cgiedit.c
+++ b/cgiedit.c
@@ -1,4 +1,4 @@
-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.73 2012/03/09 16:23:50 fabiankeil Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.74 2012/03/09 16:24:36 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
@@ -494,7 +494,7 @@ jb_err cgi_edit_actions_url_form(struct client_state *csp,
       cur_line = cur_line->next;
    }
 
-   if ((cur_line == NULL)
+   if ( (cur_line == NULL)
      || (line_number != patternid)
      || (patternid < 1U)
      || (cur_line->type != FILE_LINE_URL))
@@ -654,7 +654,7 @@ jb_err cgi_edit_actions_remove_url_form(struct client_state *csp,
       cur_line = cur_line->next;
    }
 
-   if ((cur_line == NULL)
+   if ( (cur_line == NULL)
      || (line_number != patternid)
      || (patternid < 1U)
      || (cur_line->type != FILE_LINE_URL))
@@ -1135,7 +1135,7 @@ jb_err edit_parse_actions_file(struct editable_file * file)
     * empty (which is valid, but pointless).
     */
    while ((cur_line != NULL)
-        && (cur_line->unprocessed[0] == '\0'))
+       && (cur_line->unprocessed[0] == '\0'))
    {
       /* Blank line */
       cur_line->type = FILE_LINE_BLANK;
@@ -1143,7 +1143,7 @@ jb_err edit_parse_actions_file(struct editable_file * file)
    }
 
    if ((cur_line != NULL)
-     && (cur_line->unprocessed[0] != '{'))
+    && (cur_line->unprocessed[0] != '{'))
    {
       /* File doesn't start with a header */
       file->parse_error = cur_line;
@@ -1152,7 +1152,7 @@ jb_err edit_parse_actions_file(struct editable_file * file)
    }
 
    if ((cur_line != NULL) && (0 ==
-      match_actions_file_header_line(cur_line->unprocessed, "settings")) )
+      match_actions_file_header_line(cur_line->unprocessed, "settings")))
    {
       cur_line->type = FILE_LINE_SETTINGS_HEADER;
 
@@ -1187,7 +1187,7 @@ jb_err edit_parse_actions_file(struct editable_file * file)
    }
 
    if ((cur_line != NULL) && (0 ==
-      match_actions_file_header_line(cur_line->unprocessed, "description")) )
+      match_actions_file_header_line(cur_line->unprocessed, "description")))
    {
       cur_line->type = FILE_LINE_DESCRIPTION_HEADER;
 
@@ -1207,7 +1207,7 @@ jb_err edit_parse_actions_file(struct editable_file * file)
    }
 
    if ((cur_line != NULL) && (0 ==
-      match_actions_file_header_line(cur_line->unprocessed, "alias")) )
+      match_actions_file_header_line(cur_line->unprocessed, "alias")))
    {
       cur_line->type = FILE_LINE_ALIAS_HEADER;
 
@@ -1318,7 +1318,7 @@ jb_err edit_parse_actions_file(struct editable_file * file)
       }
       while ((len > (size_t)0)
            && ((text[len - 1] == ' ')
-             || (text[len - 1] == '\t')) )
+            || (text[len - 1] == '\t')))
       {
          len--;
       }
@@ -1779,7 +1779,7 @@ static jb_err get_file_name_param(struct client_state *csp,
    s = param;
    while ((ch = *s++) != '\0')
    {
-      if (((ch < 'A') || (ch > 'Z'))
+      if ( ((ch < 'A') || (ch > 'Z'))
         && ((ch < 'a') || (ch > 'z'))
         && ((ch < '0') || (ch > '9'))
         && (ch != '-')
@@ -2331,14 +2331,14 @@ jb_err cgi_edit_actions_list(struct client_state *csp,
     * cur_line->next       = /
     * cur_line->next->next = {...actions...} or EOF
     */
-   if ((cur_line != NULL)
+   if ( (cur_line != NULL)
      && (cur_line->type == FILE_LINE_ACTION)
      && (cur_line->next != NULL)
      && (cur_line->next->type == FILE_LINE_URL)
      && (0 == strcmp(cur_line->next->unprocessed, "/"))
-     && ((cur_line->next->next == NULL)
+     && ( (cur_line->next->next == NULL)
        || (cur_line->next->next->type != FILE_LINE_URL)
-     ) )
+      ) )
    {
       /*
        * Generate string with buttons to set actions for "/" to
@@ -2669,7 +2669,7 @@ jb_err cgi_edit_actions_list(struct client_state *csp,
       if (!err) err = map(section_exports, "s-next", 1, buf, 1);
 
       if ((cur_line != NULL)
-        && (cur_line->type == FILE_LINE_ACTION))
+       && (cur_line->type == FILE_LINE_ACTION))
       {
          /* Not last section */
          if (!err) err = map_block_keep(section_exports, "s-next-exists");
@@ -2793,7 +2793,7 @@ jb_err cgi_edit_actions_for_url(struct client_state *csp,
       cur_line = cur_line->next;
    }
 
-   if ((cur_line == NULL)
+   if ( (cur_line == NULL)
      || (line_number != sectionid)
      || (sectionid < 1)
      || (cur_line->type != FILE_LINE_ACTION))
@@ -3072,7 +3072,7 @@ jb_err cgi_edit_actions_submit(struct client_state *csp,
       cur_line = cur_line->next;
    }
 
-   if ((cur_line == NULL)
+   if ( (cur_line == NULL)
      || (line_number != sectionid)
      || (sectionid < 1)
      || (cur_line->type != FILE_LINE_ACTION))
@@ -3364,7 +3364,7 @@ jb_err cgi_edit_actions_url(struct client_state *csp,
    }
 
    if ((cur_line == NULL)
-     || (cur_line->type != FILE_LINE_URL))
+    || (cur_line->type != FILE_LINE_URL))
    {
       /* Invalid "patternid" parameter */
       free(new_pattern);
@@ -3476,7 +3476,7 @@ jb_err cgi_edit_actions_add_url(struct client_state *csp,
    }
 
    if ((cur_line == NULL)
-     || (cur_line->type != FILE_LINE_ACTION))
+    || (cur_line->type != FILE_LINE_ACTION))
    {
       /* Invalid "sectionid" parameter */
       free(new_pattern);
@@ -3598,7 +3598,7 @@ jb_err cgi_edit_actions_remove_url(struct client_state *csp,
       line_number++;
    }
 
-   if ((cur_line == NULL)
+   if ( (cur_line == NULL)
      || (prev_line == NULL)
      || (cur_line->type != FILE_LINE_URL))
    {
@@ -3706,7 +3706,7 @@ jb_err cgi_edit_actions_section_remove(struct client_state *csp,
    }
 
    if ((cur_line == NULL)
-     || (cur_line->type != FILE_LINE_ACTION))
+    || (cur_line->type != FILE_LINE_ACTION))
    {
       /* Invalid "sectionid" parameter */
       edit_free_file(file);
@@ -3714,7 +3714,7 @@ jb_err cgi_edit_actions_section_remove(struct client_state *csp,
    }
 
    if ((cur_line->next != NULL)
-     && (cur_line->next->type == FILE_LINE_URL))
+    && (cur_line->next->type == FILE_LINE_URL))
    {
       /* Section not empty. */
       edit_free_file(file);
@@ -3851,7 +3851,7 @@ jb_err cgi_edit_actions_section_add(struct client_state *csp,
       }
 
       if ((cur_line == NULL)
-        || (cur_line->type != FILE_LINE_ACTION))
+       || (cur_line->type != FILE_LINE_ACTION))
       {
          /* Invalid "sectionid" parameter */
          edit_free_file(file);
@@ -3860,7 +3860,7 @@ jb_err cgi_edit_actions_section_add(struct client_state *csp,
 
       /* Skip through the section to find the last line in it. */
       while ((cur_line->next != NULL)
-           && (cur_line->next->type != FILE_LINE_ACTION))
+          && (cur_line->next->type != FILE_LINE_ACTION))
       {
          cur_line = cur_line->next;
          line_number++;
@@ -4019,7 +4019,7 @@ jb_err cgi_edit_actions_section_swap(struct client_state *csp,
    }
 
    if ((cur_line == NULL)
-     || (cur_line->type != FILE_LINE_ACTION))
+    || (cur_line->type != FILE_LINE_ACTION))
    {
       /* Invalid "section1" parameter */
       edit_free_file(file);
@@ -4051,7 +4051,7 @@ jb_err cgi_edit_actions_section_swap(struct client_state *csp,
       }
 
       if ((cur_line == NULL)
-        || (cur_line->type != FILE_LINE_ACTION))
+       || (cur_line->type != FILE_LINE_ACTION))
       {
          /* Invalid "section2" parameter */
          edit_free_file(file);