--------------------- PatchSet 11206 Date: 2007/01/26 02:02:25 Author: hno Branch: HEAD Tag: (none) Log: And even more const GCC warnings Members: src/url.c:1.146->1.147 Index: squid/src/url.c =================================================================== RCS file: /cvsroot/squid/squid/src/url.c,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- squid/src/url.c 26 Jan 2007 01:51:24 -0000 1.146 +++ squid/src/url.c 26 Jan 2007 02:02:25 -0000 1.147 @@ -1,6 +1,6 @@ /* - * $Id: url.c,v 1.146 2007/01/26 01:51:24 hno Exp $ + * $Id: url.c,v 1.147 2007/01/26 02:02:25 hno Exp $ * * DEBUG: section 23 URL Parsing * AUTHOR: Duane Wessels @@ -37,54 +37,54 @@ rms_t RequestMethods[] = { - {"NONE", 4}, - {"GET", 3}, - {"POST", 4}, - {"PUT", 3}, - {"HEAD", 4}, - {"CONNECT", 7}, - {"TRACE", 5}, - {"PURGE", 5}, - {"OPTIONS", 7}, - {"DELETE", 6}, - {"PROPFIND", 8}, - {"PROPPATCH", 9}, - {"MKCOL", 5}, - {"COPY", 4}, - {"MOVE", 4}, - {"LOCK", 4}, - {"UNLOCK", 6}, - {"BMOVE", 5}, - {"BDELETE", 7}, - {"BPROPFIND", 9}, - {"BPROPPATCH", 10}, - {"BCOPY", 5}, - {"SEARCH", 6}, - {"SUBSCRIBE", 9}, - {"UNSUBSCRIBE", 11}, - {"POLL", 4}, - {"REPORT", 6}, - {"%EXT00", 6}, - {"%EXT01", 6}, - {"%EXT02", 6}, - {"%EXT03", 6}, - {"%EXT04", 6}, - {"%EXT05", 6}, - {"%EXT06", 6}, - {"%EXT07", 6}, - {"%EXT08", 6}, - {"%EXT09", 6}, - {"%EXT10", 6}, - {"%EXT11", 6}, - {"%EXT12", 6}, - {"%EXT13", 6}, - {"%EXT14", 6}, - {"%EXT15", 6}, - {"%EXT16", 6}, - {"%EXT17", 6}, - {"%EXT18", 6}, - {"%EXT19", 6}, - {"ERROR", 5}, + {(char *) "NONE", 4}, + {(char *) "GET", 3}, + {(char *) "POST", 4}, + {(char *) "PUT", 3}, + {(char *) "HEAD", 4}, + {(char *) "CONNECT", 7}, + {(char *) "TRACE", 5}, + {(char *) "PURGE", 5}, + {(char *) "OPTIONS", 7}, + {(char *) "DELETE", 6}, + {(char *) "PROPFIND", 8}, + {(char *) "PROPPATCH", 9}, + {(char *) "MKCOL", 5}, + {(char *) "COPY", 4}, + {(char *) "MOVE", 4}, + {(char *) "LOCK", 4}, + {(char *) "UNLOCK", 6}, + {(char *) "BMOVE", 5}, + {(char *) "BDELETE", 7}, + {(char *) "BPROPFIND", 9}, + {(char *) "BPROPPATCH", 10}, + {(char *) "BCOPY", 5}, + {(char *) "SEARCH", 6}, + {(char *) "SUBSCRIBE", 9}, + {(char *) "UNSUBSCRIBE", 11}, + {(char *) "POLL", 4}, + {(char *) "REPORT", 6}, + {(char *) "%EXT00", 6}, + {(char *) "%EXT01", 6}, + {(char *) "%EXT02", 6}, + {(char *) "%EXT03", 6}, + {(char *) "%EXT04", 6}, + {(char *) "%EXT05", 6}, + {(char *) "%EXT06", 6}, + {(char *) "%EXT07", 6}, + {(char *) "%EXT08", 6}, + {(char *) "%EXT09", 6}, + {(char *) "%EXT10", 6}, + {(char *) "%EXT11", 6}, + {(char *) "%EXT12", 6}, + {(char *) "%EXT13", 6}, + {(char *) "%EXT14", 6}, + {(char *) "%EXT15", 6}, + {(char *) "%EXT16", 6}, + {(char *) "%EXT17", 6}, + {(char *) "%EXT18", 6}, + {(char *) "%EXT19", 6}, + {(char *) "ERROR", 5}, }; const char *ProtocolStr[] = @@ -450,7 +450,7 @@ char *t; int i; const char *s; - char *ts = "://"; + static const char ts[] = "://"; if (request->protocol == PROTO_URN) { snprintf(buf, MAX_URL, "urn:%s", strBuf(request->urlpath));