---------------------
PatchSet 6669 
Date: 2005/05/16 20:52:40
Author: hno
Branch: icap-2_5
Tag: (none) 
Log:
  - strnstr prototype in util.h. needed for compiling strnstr.c

  - a number module-local functions declared without static

  - strcasestr is a GNU extension. Prototype only available if
_GNU_SOURCE is defined (glibc systems).

Members: 
	lib/strnstr.c:1.1.2.1->1.1.2.2 
	src/http.c:1.17.6.3.6.34->1.17.6.3.6.35 
	src/icap_common.c:1.1.2.37->1.1.2.38 
	src/icap_respmod.c:1.1.2.55->1.1.2.56 

Index: squid/lib/strnstr.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/Attic/strnstr.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/lib/strnstr.c	17 Oct 2003 19:53:11 -0000	1.1.2.1
+++ squid/lib/strnstr.c	16 May 2005 20:52:40 -0000	1.1.2.2
@@ -27,6 +27,7 @@
 #include "config.h"
 #ifndef HAVE_STRNSTR
 #include <string.h>
+#include <util.h>
 
 char *strnstr(const char *haystack, const char *needle, size_t haystacklen)
 {
Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/http.c,v
retrieving revision 1.17.6.3.6.34
retrieving revision 1.17.6.3.6.35
diff -u -r1.17.6.3.6.34 -r1.17.6.3.6.35
--- squid/src/http.c	26 Apr 2005 16:10:09 -0000	1.17.6.3.6.34
+++ squid/src/http.c	16 May 2005 20:52:40 -0000	1.17.6.3.6.35
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.c,v 1.17.6.3.6.34 2005/04/26 16:10:09 chtsanti Exp $
+ * $Id: http.c,v 1.17.6.3.6.35 2005/05/16 20:52:40 hno Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -903,7 +903,7 @@
 }
 
 #ifdef HS_FEAT_ICAP
-int
+static int
 httpReadReplyWaitForIcap(int fd, void *data)
 {
     HttpStateData *httpState = data;
Index: squid/src/icap_common.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/icap_common.c,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -r1.1.2.37 -r1.1.2.38
--- squid/src/icap_common.c	14 May 2005 07:55:58 -0000	1.1.2.37
+++ squid/src/icap_common.c	16 May 2005 20:52:41 -0000	1.1.2.38
@@ -1,5 +1,5 @@
 /*
- * $Id: icap_common.c,v 1.1.2.37 2005/05/14 07:55:58 chtsanti Exp $
+ * $Id: icap_common.c,v 1.1.2.38 2005/05/16 20:52:41 hno Exp $
  *
  * DEBUG: section 81    Internet Content Adaptation Protocol (ICAP) Client
  * AUTHOR: Geetha Manjunath, Hewlett Packard Company
@@ -32,7 +32,11 @@
  *
  */
 
+/* _GNU_SOURCE is required for strcasestr */
+#define _GNU_SOURCE 1
+
 #include "squid.h"
+#include "util.h"
 
 extern PF httpStateFree;
 
Index: squid/src/icap_respmod.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/icap_respmod.c,v
retrieving revision 1.1.2.55
retrieving revision 1.1.2.56
diff -u -r1.1.2.55 -r1.1.2.56
--- squid/src/icap_respmod.c	15 May 2005 20:10:33 -0000	1.1.2.55
+++ squid/src/icap_respmod.c	16 May 2005 20:52:41 -0000	1.1.2.56
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icap_respmod.c,v 1.1.2.55 2005/05/15 20:10:33 chtsanti Exp $
+ * $Id: icap_respmod.c,v 1.1.2.56 2005/05/16 20:52:41 hno Exp $
  *
  * DEBUG: section 81    Internet Content Adaptation Protocol (ICAP) Client
  * AUTHOR: Geetha Manjunath, Hewlett Packard Company
@@ -763,7 +763,7 @@
     return icap->httpState->reply_hdr_state;
 }
 
-void
+static void
 icapProcessHttpReplyHeader(IcapStateData * icap, const char *buf, int size)
 {
     if (NULL == icap->httpState) {