--------------------- PatchSet 10300 Date: 2007/12/22 14:45:21 Author: adri Branch: s27_adri Tag: (none) Log: Finalise this routine. Members: libhttp/HttpStrList.c:1.1.2.3->1.1.2.4 Index: squid/libhttp/HttpStrList.c =================================================================== RCS file: /cvsroot/squid-sf//squid/libhttp/Attic/HttpStrList.c,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/libhttp/HttpStrList.c 20 Dec 2007 03:22:36 -0000 1.1.2.3 +++ squid/libhttp/HttpStrList.c 22 Dec 2007 14:45:21 -0000 1.1.2.4 @@ -1,6 +1,6 @@ /* - * $Id: HttpStrList.c,v 1.1.2.3 2007/12/20 03:22:36 adri Exp $ + * $Id: HttpStrList.c,v 1.1.2.4 2007/12/22 14:45:21 adri Exp $ * * DEBUG: section 66 HTTP Header Tools * AUTHOR: Alex Rousskov @@ -85,13 +85,12 @@ int strIsSubstr(const String * list, const char *s) { - const char *p; + int p; assert(list && s); - assert(1==0); /* XXX fix this routine damnit! */ p = strStr(*list, s); - if (!p) + if (p == -1) return 0; - if (strstr(p + 1, s) != NULL) + if (strStrOffset(*list, p + 1, s) != -1) return 2; return 1; }