From: wessels <> Date: Tue, 28 Apr 1998 01:15:59 +0000 (+0000) Subject: compiler warnings by Ilia Zadorozhko X-Git-Tag: SQUID_3_0_PRE1~3408 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3f9588e7ac21e4539dc45be86e00e885eaa6935;p=thirdparty%2Fsquid.git compiler warnings by Ilia Zadorozhko --- diff --git a/ChangeLog b/ChangeLog index 2d39786b4f..394dc5c0ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ - Added Italian error pages by Alessio Bragadini. + - Added Estonian error pages by Toomas Soome. - Fixed asnAclInitialize calling to prevent coredump. - Fixed FTP directory parsing again. - Made FTP directory listing "Generated" tagline like diff --git a/lib/GNUregex.c b/lib/GNUregex.c index ee5ff3197f..ba3a624caa 100644 --- a/lib/GNUregex.c +++ b/lib/GNUregex.c @@ -1564,11 +1564,12 @@ regex_compile(pattern, size, syntax, bufp) if (syntax & RE_NO_BK_PARENS) goto normal_backslash; - if (COMPILE_STACK_EMPTY) + if (COMPILE_STACK_EMPTY) { if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) goto normal_backslash; else return REG_ERPAREN; + } handle_close: if (fixup_alt_jump) { /* Push a dummy failure point at the end of the @@ -1582,11 +1583,12 @@ regex_compile(pattern, size, syntax, bufp) STORE_JUMP(jump_past_alt, fixup_alt_jump, b - 1); } /* See similar code for backslashed left paren above. */ - if (COMPILE_STACK_EMPTY) + if (COMPILE_STACK_EMPTY) { if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD) goto normal_char; else return REG_ERPAREN; + } /* Since we just checked for an empty stack above, this * ``can't happen''. */ diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc index 426ad6bec4..ffdb7be030 100644 --- a/src/HttpHeaderTools.cc +++ b/src/HttpHeaderTools.cc @@ -1,5 +1,5 @@ /* - * $Id: HttpHeaderTools.cc,v 1.9 1998/04/24 07:09:28 wessels Exp $ + * $Id: HttpHeaderTools.cc,v 1.10 1998/04/27 19:16:05 wessels Exp $ * * DEBUG: section 66 HTTP Header Tools * AUTHOR: Alex Rousskov @@ -119,13 +119,14 @@ strListGetItem(const char *str, char del, const char **item, int *ilen, const ch { size_t len; assert(str && item && pos); - if (*pos) + if (*pos) { if (!**pos) /* end of string */ return 0; else (*pos)++; - else + } else { *pos = str; + } /* skip leading ws (ltrim) */ *pos += xcountws(*pos); diff --git a/src/HttpReply.cc b/src/HttpReply.cc index df0aa82b2e..ee1319fd3f 100644 --- a/src/HttpReply.cc +++ b/src/HttpReply.cc @@ -1,6 +1,6 @@ /* - * $Id: HttpReply.cc,v 1.15 1998/04/06 22:32:09 wessels Exp $ + * $Id: HttpReply.cc,v 1.16 1998/04/27 19:16:06 wessels Exp $ * * DEBUG: section 58 HTTP Reply (Response) * AUTHOR: Alex Rousskov @@ -327,11 +327,12 @@ httpReplyParseStep(HttpReply * rep, const char *buf, int atEnd) rep->pstate++; } if (rep->pstate == psReadyToParseHeaders) { - if (!httpReplyIsolateHeaders(&parse_start, &blk_start, &blk_end)) + if (!httpReplyIsolateHeaders(&parse_start, &blk_start, &blk_end)) { if (atEnd) blk_start = parse_start, blk_end = blk_start + strlen(blk_start); else return 0; + } if (!httpHeaderParse(&rep->header, blk_start, blk_end)) return httpReplyParseError(rep); diff --git a/src/debug.cc b/src/debug.cc index aa91e8ba13..b91a10abdc 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -1,6 +1,6 @@ /* - * $Id: debug.cc,v 1.64 1998/03/06 23:22:25 wessels Exp $ + * $Id: debug.cc,v 1.65 1998/04/27 19:16:08 wessels Exp $ * * DEBUG: section 0 Debug Routines * AUTHOR: Harvest Derived @@ -384,11 +384,11 @@ debugLogTime(time_t t) */ static int Ctx_Warn_Level = 32; /* all descriptions has been printed up to this level */ -static Ctx_Reported_Level = -1; +static int Ctx_Reported_Level = -1; /* descriptions are still valid or active up to this level */ -static Ctx_Valid_Level = -1; +static int Ctx_Valid_Level = -1; /* current level, the number of nested ctx_enter() calls */ -static Ctx_Current_Level = -1; +static int Ctx_Current_Level = -1; /* saved descriptions (stack) */ static const char *Ctx_Descrs[CTX_MAX_LEVEL + 1]; /* "safe" get secription */ diff --git a/src/peer_digest.cc b/src/peer_digest.cc index a9b874d736..93cfd92896 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -1,6 +1,6 @@ /* - * $Id: peer_digest.cc,v 1.19 1998/04/24 07:09:40 wessels Exp $ + * $Id: peer_digest.cc,v 1.20 1998/04/27 19:16:10 wessels Exp $ * * DEBUG: section 72 Peer Digest Routines * AUTHOR: Alex Rousskov @@ -208,7 +208,7 @@ peerDigestValidate(peer * p) } /* start request if needed */ if (do_request) { - static nest_level = 0; + static int nest_level = 0; nest_level++; assert(nest_level == 1); debug(72, 2) ("peerDigestValidate: %s requesting; old entry expires: %s\n", diff --git a/src/snmp_core.cc b/src/snmp_core.cc index 140c5296e1..5a9a1cec05 100644 --- a/src/snmp_core.cc +++ b/src/snmp_core.cc @@ -1,5 +1,5 @@ /* - * $Id: snmp_core.cc,v 1.3 1998/04/08 17:22:13 wessels Exp $ + * $Id: snmp_core.cc,v 1.4 1998/04/27 19:16:11 wessels Exp $ * * DEBUG: section 49 SNMP support * AUTHOR: Kostas Anagnostakis @@ -67,7 +67,7 @@ int snmp_dump_packet; void *users, *communities; static struct sockaddr_in local_snmpd; -static snmp_init_config = 0; +static int snmp_init_config = 0; struct snmp_session *Session; struct snmp_pdu *snmpAgentResponse(struct snmp_pdu *PDU); diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc index f3d66679f2..8afb33677c 100644 --- a/src/store_rebuild.cc +++ b/src/store_rebuild.cc @@ -1,5 +1,5 @@ /* - * $Id: store_rebuild.cc,v 1.34 1998/04/22 16:24:16 rousskov Exp $ + * $Id: store_rebuild.cc,v 1.35 1998/04/27 19:16:12 wessels Exp $ * * DEBUG: section 20 Store Rebuild Routines * AUTHOR: Duane Wessels @@ -34,7 +34,7 @@ typedef struct _rebuild_dir rebuild_dir; -typedef RBHD(rebuild_dir * d); +typedef int RBHD(rebuild_dir * d); struct _rebuild_dir { int dirn;