Fix cparser warnings.

diff --git a/cgiedit.c b/cgiedit.c
index 0f04169..b346e8e 100644 (file)
--- a/cgiedit.c
+++ b/cgiedit.c
@@ -1,4 +1,4 @@
-const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.62 2008/08/31 15:59:02 fabiankeil Exp $";
+const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.63 2008/12/04 18:15:38 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgiedit.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgiedit.c,v $


@@ -42,6 +42,9 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.62 2008/08/31 15:59:02 fabiankeil
  *
  * Revisions   :
  *    $Log: cgiedit.c,v $
  *
  * Revisions   :
  *    $Log: cgiedit.c,v $

+ *    Revision 1.63  2008/12/04 18:15:38  fabiankeil
+ *    Fix some cparser warnings.
+ *

  *    Revision 1.62  2008/08/31 15:59:02  fabiankeil
  *    There's no reason to let remote toggling support depend
  *    on FEATURE_CGI_EDIT_ACTIONS, so make sure it doesn't.
  *    Revision 1.62  2008/08/31 15:59:02  fabiankeil
  *    There's no reason to let remote toggling support depend
  *    on FEATURE_CGI_EDIT_ACTIONS, so make sure it doesn't.


@@ -2637,6 +2640,7 @@ jb_err cgi_edit_actions(struct client_state *csp,
                         struct http_response *rsp,
                         const struct map *parameters)
 {
                         struct http_response *rsp,
                         const struct map *parameters)
 {

+   (void)parameters;

 
    if (0 == (csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS))
    {
 
    if (0 == (csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS))
    {

diff --git a/cgisimple.c b/cgisimple.c
index 1cebfe6..62ba94e 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.88 2008/08/30 12:03:07 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.89 2008/10/11 11:31:14 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $


@@ -36,6 +36,10 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.88 2008/08/30 12:03:07 fabian
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $

+ *    Revision 1.89  2008/10/11 11:31:14  fabiankeil
+ *    Add FEATURE_CONNECTION_KEEP_ALIVE to the list
+ *    of conditional defines on the show-status page.
+ *

  *    Revision 1.88  2008/08/30 12:03:07  fabiankeil
  *    Remove FEATURE_COOKIE_JAR.
  *
  *    Revision 1.88  2008/08/30 12:03:07  fabiankeil
  *    Remove FEATURE_COOKIE_JAR.
  *


@@ -494,6 +498,8 @@ jb_err cgi_default(struct client_state *csp,
 {
    struct map *exports;
 
 {
    struct map *exports;
 

+   (void)parameters;
+

    assert(csp);
    assert(rsp);
 
    assert(csp);
    assert(rsp);
 


@@ -810,6 +816,9 @@ jb_err cgi_transparent_image(struct client_state *csp,
                              struct http_response *rsp,
                              const struct map *parameters)
 {
                              struct http_response *rsp,
                              const struct map *parameters)
 {

+   (void)csp;
+   (void)parameters;
+

    rsp->body = bindup(image_blank_data, image_blank_length);
    rsp->content_length = image_blank_length;
 
    rsp->body = bindup(image_blank_data, image_blank_length);
    rsp->content_length = image_blank_length;
 


@@ -868,6 +877,9 @@ jb_err cgi_send_default_favicon(struct client_state *csp,
       "\017\000\000";
    static const size_t favicon_length = sizeof(default_favicon_data) - 1;
 
       "\017\000\000";
    static const size_t favicon_length = sizeof(default_favicon_data) - 1;
 

+   (void)csp;
+   (void)parameters;
+

    rsp->body = bindup(default_favicon_data, favicon_length);
    rsp->content_length = favicon_length;
 
    rsp->body = bindup(default_favicon_data, favicon_length);
    rsp->content_length = favicon_length;
 


@@ -926,6 +938,9 @@ jb_err cgi_send_error_favicon(struct client_state *csp,
       "\017\000\000";
    static const size_t favicon_length = sizeof(error_favicon_data) - 1;
 
       "\017\000\000";
    static const size_t favicon_length = sizeof(error_favicon_data) - 1;
 

+   (void)csp;
+   (void)parameters;
+

    rsp->body = bindup(error_favicon_data, favicon_length);
    rsp->content_length = favicon_length;
 
    rsp->body = bindup(error_favicon_data, favicon_length);
    rsp->content_length = favicon_length;
 


@@ -973,6 +988,8 @@ jb_err cgi_send_stylesheet(struct client_state *csp,
    assert(csp);
    assert(rsp);
 
    assert(csp);
    assert(rsp);
 

+   (void)parameters;
+

    err = template_load(csp, &rsp->body, "cgi-style.css", 0);
 
    if (err == JB_ERR_FILE)
    err = template_load(csp, &rsp->body, "cgi-style.css", 0);
 
    if (err == JB_ERR_FILE)


@@ -1023,6 +1040,9 @@ jb_err cgi_send_url_info_osd(struct client_state *csp,
    jb_err err = JB_ERR_MEMORY;
    struct map *exports = default_exports(csp, NULL);
 
    jb_err err = JB_ERR_MEMORY;
    struct map *exports = default_exports(csp, NULL);
 

+   (void)csp;
+   (void)parameters;
+

    if (NULL != exports)
    {
       err = template_fill_for_cgi(csp, "url-info-osd.xml", exports, rsp);
    if (NULL != exports)
    {
       err = template_fill_for_cgi(csp, "url-info-osd.xml", exports, rsp);


@@ -1301,7 +1321,7 @@ jb_err cgi_show_status(struct client_state *csp,
          if (!err) err = string_append(&s, "<tr><td>");
          if (!err) err = string_join(&s, html_encode(csp->actions_list[i]->filename));
          snprintf(buf, sizeof(buf),
          if (!err) err = string_append(&s, "<tr><td>");
          if (!err) err = string_join(&s, html_encode(csp->actions_list[i]->filename));
          snprintf(buf, sizeof(buf),

-            "</td><td class=\"buttons\"><a href=\"/show-status?file=actions&amp;index=%d\">View</a>", i);
+            "</td><td class=\"buttons\"><a href=\"/show-status?file=actions&amp;index=%u\">View</a>", i);

          if (!err) err = string_append(&s, buf);
 
 #ifdef FEATURE_CGI_EDIT_ACTIONS
          if (!err) err = string_append(&s, buf);
 
 #ifdef FEATURE_CGI_EDIT_ACTIONS


@@ -1313,7 +1333,7 @@ jb_err cgi_show_status(struct client_state *csp,
             if (access(csp->config->actions_file[i], W_OK) == 0)
             {
 #endif /* def HAVE_ACCESS */
             if (access(csp->config->actions_file[i], W_OK) == 0)
             {
 #endif /* def HAVE_ACCESS */

-               snprintf(buf, sizeof(buf), "&nbsp;&nbsp;<a href=\"/edit-actions-list?f=%d\">Edit</a>", i);
+               snprintf(buf, sizeof(buf), "&nbsp;&nbsp;<a href=\"/edit-actions-list?f=%u\">Edit</a>", i);

                if (!err) err = string_append(&s, buf);
 #ifdef HAVE_ACCESS
             }
                if (!err) err = string_append(&s, buf);
 #ifdef HAVE_ACCESS
             }


@@ -1348,8 +1368,8 @@ jb_err cgi_show_status(struct client_state *csp,
       {
          if (!err) err = string_append(&s, "<tr><td>");
          if (!err) err = string_join(&s, html_encode(csp->rlist[i]->filename));
       {
          if (!err) err = string_append(&s, "<tr><td>");
          if (!err) err = string_join(&s, html_encode(csp->rlist[i]->filename));

-         snprintf(buf, 100,
-            "</td><td class=\"buttons\"><a href=\"/show-status?file=filter&amp;index=%d\">View</a>", i);
+         snprintf(buf, sizeof(buf),
+            "</td><td class=\"buttons\"><a href=\"/show-status?file=filter&amp;index=%u\">View</a>", i);

          if (!err) err = string_append(&s, buf);
          if (!err) err = string_append(&s, "</td></tr>\n");
       }
          if (!err) err = string_append(&s, buf);
          if (!err) err = string_append(&s, "</td></tr>\n");
       }


@@ -1826,6 +1846,9 @@ jb_err cgi_robots_txt(struct client_state *csp,
    char buf[100];
    jb_err err;
 
    char buf[100];
    jb_err err;
 

+   (void)csp;
+   (void)parameters;
+

    rsp->body = strdup(
       "# This is the Privoxy control interface.\n"
       "# It isn't very useful to index it, and you're likely to break stuff.\n"
    rsp->body = strdup(
       "# This is the Privoxy control interface.\n"
       "# It isn't very useful to index it, and you're likely to break stuff.\n"