* webcit.c: moved request_method[] out of the global scope (yikes!!!)

* rss.c: removed "const" from function declarations to silence
         a compiler warning

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index d2eedda3ced90d82e45516475abfaf3bda8ee978..e25bd849271c3a5a2b0166d2822c33605fa69c09 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 625.18  2005/09/20 21:59:22  ajc
+* webcit.c: moved request_method[] out of the global scope (yikes!!!)
+* rss.c: removed "const" from function declarations to silence
+         a compiler warning
+
 Revision 625.17  2005/09/19 02:56:21  ajc
 * Two-pane mail reading now uses Ajax instead of a hidden iframe, and it's
   very crisp and responsive.
@@ -3037,4 +3042,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/rss.c b/webcit/rss.c
index 2cf83c94e6720c05f293cb1c9aa259c8c661c88a..0e71987f2401c8a6e20fdb8d06ec1512ac1bf189 100644 (file)
--- a/webcit/rss.c
+++ b/webcit/rss.c
@@ -11,7 +11,7 @@
 time_t if_modified_since;
 
 
-void display_rss_control(const char *reply_to, const char *subject)
+void display_rss_control(char *reply_to, char *subject)
 {
        wprintf("<div style=\"align: right;\"><p>\n");
        wprintf("<a href=\"/display_enter?recp=");
@@ -30,7 +30,7 @@ void display_rss_control(const char *reply_to, const char *subject)
 }
 
 
-void display_rss(const char *roomname)
+void display_rss(char *roomname, char *request_method)
 {
        int nummsgs;
        int a, b;
@@ -61,7 +61,7 @@ void display_rss(const char *roomname)
                return;
        }
 
-       if (gotoroom(roomname)) {
+       if (gotoroom((char *)roomname)) {
                lprintf(3, "RSS: Can't goto requested room\n");
                wprintf("HTTP/1.1 404 Not Found\r\n");
                wprintf("Content-Type: text/html\r\n");

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 9c510fab5cadc3ab2f028a674472c44dc8b72b39..4478c3bce6a3736e0cc490bd302dc0a4f0ecbdc5 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -12,8 +12,6 @@
 #include "webserver.h"
 #include "mime_parser.h"
 
-char request_method[128];
-
 /*
  * String to unset the cookie.
  * Any date "in the past" will work, so I chose my birthday, right down to
@@ -831,6 +829,7 @@ void session_loop(struct httprequest *req)
        char arg2[128];
        char arg3[128];
        char buf[SIZ];
+       char request_method[128];
        int a, b;
        int ContentLength = 0;
        int BytesRead = 0;
@@ -1061,7 +1060,7 @@ void session_loop(struct httprequest *req)
 
        /* This needs to run early */
        if (!strcasecmp(action, "rss")) {
-               display_rss(bstr("room"));
+               display_rss(bstr("room"), request_method);
                goto SKIP_ALL_THIS_CRAP;
        }
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 9dfa8ab538f726fa448764adfcb0433699ef8095..df2b571f1f23e6ad1dfe57f88225ade72834554f 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -324,7 +324,6 @@ extern char *axdefs[];
 extern char *ctdlhost, *ctdlport;
 extern char *server_cookie;
 extern int is_https;
-extern char request_method[];
 extern int setup_wizard;
 extern char wizard_filename[];
 extern time_t if_modified_since;
@@ -560,7 +559,7 @@ void display_customize_iconbar(void);
 void commit_iconbar(void);
 int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen);
 void spawn_another_worker_thread(void);
-void display_rss(const char *roomname);
+void display_rss(char *roomname, char *request_method);
 
 void embed_room_banner(char *, int);
 /* navbar types that can be passed to embed_room_banner */
@@ -586,6 +585,9 @@ int ZEXPORT compress_gzip(Bytef * dest, uLongf * destLen,
                           const Bytef * source, uLong sourceLen, int level);
 #endif
 
+#ifdef HAVE_ICONV
+void utf8ify_rfc822_string(char *buf);
+#endif
 
 void begin_burst(void);
 void end_burst(void);