1 Index: squid/helpers/basic_auth/MSNT/smblib.c
2 diff -c squid/helpers/basic_auth/MSNT/smblib.c:1.1.2.3 squid/helpers/basic_auth/MSNT/smblib.c:1.1.2.4
3 *** squid/helpers/basic_auth/MSNT/smblib.c:1.1.2.3 Wed Mar 9 07:28:32 2005
4 --- squid/helpers/basic_auth/MSNT/smblib.c Thu Jun 30 12:50:55 2005
7 * service we are going to call, sine some servers want it in uppercase */
9 for (i = 0; i < strlen(server); i++)
10 ! called[i] = toupper(server[i]);
12 called[strlen(server)] = 0; /* Make it a string */
14 for (i = 0; i < strlen(con->myname); i++)
15 ! calling[i] = toupper(con->myname[i]);
17 calling[strlen(con->myname)] = 0; /* Make it a string */
20 * service we are going to call, sine some servers want it in uppercase */
22 for (i = 0; i < strlen(server); i++)
23 ! called[i] = xtoupper(server[i]);
25 called[strlen(server)] = 0; /* Make it a string */
27 for (i = 0; i < strlen(con->myname); i++)
28 ! calling[i] = xtoupper(con->myname[i]);
30 calling[strlen(con->myname)] = 0; /* Make it a string */
34 * service we are going to call, sine some servers want it in uppercase */
36 for (i = 0; i < strlen(host); i++)
37 ! called[i] = toupper(host[i]);
39 called[strlen(host)] = 0; /* Make it a string */
41 for (i = 0; i < strlen(con->myname); i++)
42 ! calling[i] = toupper(con->myname[i]);
44 calling[strlen(con->myname)] = 0; /* Make it a string */
47 * service we are going to call, sine some servers want it in uppercase */
49 for (i = 0; i < strlen(host); i++)
50 ! called[i] = xtoupper(host[i]);
52 called[strlen(host)] = 0; /* Make it a string */
54 for (i = 0; i < strlen(con->myname); i++)
55 ! calling[i] = xtoupper(con->myname[i]);
57 calling[strlen(con->myname)] = 0; /* Make it a string */
59 Index: squid/helpers/basic_auth/MSNT/smblib.h
60 diff -c squid/helpers/basic_auth/MSNT/smblib.h:1.1.2.1 squid/helpers/basic_auth/MSNT/smblib.h:1.1.2.2
61 *** squid/helpers/basic_auth/MSNT/smblib.h:1.1.2.1 Wed Jun 26 13:11:17 2002
62 --- squid/helpers/basic_auth/MSNT/smblib.h Thu Jun 30 12:50:55 2005
66 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
70 #include "std-defines.h"
71 #include "smblib-common.h"
73 Index: squid/helpers/external_acl/winbind_group/wb_check_group.c
74 diff -c squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.11 squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.12
75 *** squid/helpers/external_acl/winbind_group/wb_check_group.c:1.2.2.11 Fri Mar 25 19:50:50 2005
76 --- squid/helpers/external_acl/winbind_group/wb_check_group.c Thu Jun 30 12:50:55 2005
80 static int strCaseCmp (const char *s1, const char *s2)
82 ! while (*s1 && toupper (*s1) == toupper (*s2)) s1++, s2++;
88 static int strCaseCmp (const char *s1, const char *s2)
90 ! while (*s1 && xtoupper (*s1) == xtoupper (*s2)) s1++, s2++;
94 Index: squid/helpers/ntlm_auth/SMB/ntlm_auth.c
95 diff -c squid/helpers/ntlm_auth/SMB/ntlm_auth.c:1.12.2.2 squid/helpers/ntlm_auth/SMB/ntlm_auth.c:1.12.2.3
96 *** squid/helpers/ntlm_auth/SMB/ntlm_auth.c:1.12.2.2 Wed Mar 9 07:30:37 2005
97 --- squid/helpers/ntlm_auth/SMB/ntlm_auth.c Thu Jun 30 12:50:55 2005
132 Index: squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c
133 diff -c squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c:1.3.2.2 squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c:1.3.2.3
134 *** squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c:1.3.2.2 Wed Mar 9 07:33:01 2005
135 --- squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c Thu Jun 30 12:50:55 2005
138 * #endif *//* KANJI_WIN95_COMPATIBILITY */
140 if (islower((int)(unsigned char)*s))
146 * #endif *//* KANJI_WIN95_COMPATIBILITY */
148 if (islower((int)(unsigned char)*s))
153 Index: squid/helpers/ntlm_auth/SMB/smbval/smblib.c
154 diff -c squid/helpers/ntlm_auth/SMB/smbval/smblib.c:1.3.2.2 squid/helpers/ntlm_auth/SMB/smbval/smblib.c:1.3.2.3
155 *** squid/helpers/ntlm_auth/SMB/smbval/smblib.c:1.3.2.2 Wed Mar 9 07:28:32 2005
156 --- squid/helpers/ntlm_auth/SMB/smbval/smblib.c Thu Jun 30 12:50:55 2005
159 * service we are going to call, sine some servers want it in uppercase */
161 for (i = 0; i < strlen(server); i++)
162 ! called[i] = toupper(server[i]);
164 called[strlen(server)] = 0; /* Make it a string */
166 for (i = 0; i < strlen(con->myname); i++)
167 ! calling[i] = toupper(con->myname[i]);
169 calling[strlen(con->myname)] = 0; /* Make it a string */
172 * service we are going to call, sine some servers want it in uppercase */
174 for (i = 0; i < strlen(server); i++)
175 ! called[i] = xtoupper(server[i]);
177 called[strlen(server)] = 0; /* Make it a string */
179 for (i = 0; i < strlen(con->myname); i++)
180 ! calling[i] = xtoupper(con->myname[i]);
182 calling[strlen(con->myname)] = 0; /* Make it a string */
186 * service we are going to call, sine some servers want it in uppercase */
188 for (i = 0; i < strlen(host); i++)
189 ! called[i] = toupper(host[i]);
191 called[strlen(host)] = 0; /* Make it a string */
193 for (i = 0; i < strlen(con->myname); i++)
194 ! calling[i] = toupper(con->myname[i]);
196 calling[strlen(con->myname)] = 0; /* Make it a string */
199 * service we are going to call, sine some servers want it in uppercase */
201 for (i = 0; i < strlen(host); i++)
202 ! called[i] = xtoupper(host[i]);
204 called[strlen(host)] = 0; /* Make it a string */
206 for (i = 0; i < strlen(con->myname); i++)
207 ! calling[i] = xtoupper(con->myname[i]);
209 calling[strlen(con->myname)] = 0; /* Make it a string */
211 Index: squid/helpers/ntlm_auth/SMB/smbval/std-includes.h
212 diff -c squid/helpers/ntlm_auth/SMB/smbval/std-includes.h:1.2 squid/helpers/ntlm_auth/SMB/smbval/std-includes.h:1.2.2.1
213 *** squid/helpers/ntlm_auth/SMB/smbval/std-includes.h:1.2 Fri Mar 9 17:55:38 2001
214 --- squid/helpers/ntlm_auth/SMB/smbval/std-includes.h Thu Jun 30 12:50:55 2005
219 /* the types are provided by squid's configure preocess */
220 #include "squid_types.h"
223 #define int16 int16_t
225 Index: squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
226 diff -c squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.8 squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.9
227 *** squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c:1.3.2.8 Wed Mar 9 07:33:01 2005
228 --- squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c Thu Jun 30 12:50:55 2005
246 Index: squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c
247 diff -c squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.8 squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.9
248 *** squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c:1.1.2.8 Sun Feb 20 12:07:45 2005
249 --- squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c Thu Jun 30 12:50:56 2005
284 Index: squid/lib/Array.c
285 diff -c squid/lib/Array.c:1.7.2.1 squid/lib/Array.c:1.7.2.2
286 *** squid/lib/Array.c:1.7.2.1 Thu Jun 9 01:51:46 2005
287 --- squid/lib/Array.c Thu Jun 30 12:50:56 2005
294 memset(a, 0, sizeof(Array));
298 arrayClean(Array * a)
301 /* could also warn if some objects are left */
309 memset(a, 0, sizeof(Array));
313 arrayClean(Array * a)
316 /* could also warn if some objects are left */
322 arrayDestroy(Array * a)
330 arrayDestroy(Array * a)
339 arrayAppend(Array * a, void *obj)
342 if (a->count >= a->capacity)
343 arrayGrow(a, a->count + 1);
344 a->items[a->count++] = obj;
347 arrayAppend(Array * a, void *obj)
350 if (a->count >= a->capacity)
351 arrayGrow(a, a->count + 1);
352 a->items[a->count++] = obj;
356 void arrayInsert(Array *a, void *obj, int position)
359 if (a->count >= a->capacity)
360 arrayGrow(a, a->count + 1);
361 if (position > a->count)
364 void arrayInsert(Array *a, void *obj, int position)
367 if (a->count >= a->capacity)
368 arrayGrow(a, a->count + 1);
369 if (position > a->count)
373 arrayPreAppend(Array * a, int app_count)
376 if (a->count + app_count > a->capacity)
377 arrayGrow(a, a->count + app_count);
381 arrayPreAppend(Array * a, int app_count)
384 if (a->count + app_count > a->capacity)
385 arrayGrow(a, a->count + app_count);
387 Index: squid/lib/Stack.c
388 diff -c squid/lib/Stack.c:1.11 squid/lib/Stack.c:1.11.2.1
389 *** squid/lib/Stack.c:1.11 Thu Jan 11 17:37:12 2001
390 --- squid/lib/Stack.c Thu Jun 30 12:50:56 2005
397 return s->count ? s->items[--s->count] : NULL;
404 return s->count ? s->items[s->count - 1] : NULL;
411 return s->count ? s->items[--s->count] : NULL;
418 return s->count ? s->items[s->count - 1] : NULL;
420 Index: squid/lib/hash.c
421 diff -c squid/lib/hash.c:1.12 squid/lib/hash.c:1.12.2.1
422 *** squid/lib/hash.c:1.12 Wed Mar 7 10:57:37 2001
423 --- squid/lib/hash.c Thu Jun 30 12:50:56 2005
427 hash_last(hash_table * hid)
431 hid->current_slot = 0;
435 hash_last(hash_table * hid)
437 ! assert(hid != NULL);
439 hid->current_slot = 0;
444 hashFreeMemory(hash_table * hid)
452 hashFreeMemory(hash_table * hid)
454 ! assert(hid != NULL);
458 Index: squid/lib/heap.c
459 diff -c squid/lib/heap.c:1.8 squid/lib/heap.c:1.8.2.1
460 *** squid/lib/heap.c:1.8 Wed Feb 7 11:56:50 2001
461 --- squid/lib/heap.c Thu Jun 30 12:50:56 2005
464 delete_heap(heap * hp)
468 for (i = 0; i < hp->last; i++) {
472 delete_heap(heap * hp)
475 ! assert(hp != NULL);
476 for (i = 0; i < hp->last; i++) {
479 Index: squid/lib/rfc1123.c
480 diff -c squid/lib/rfc1123.c:1.29.2.2 squid/lib/rfc1123.c:1.29.2.3
481 *** squid/lib/rfc1123.c:1.29.2.2 Wed Mar 9 07:51:39 2005
482 --- squid/lib/rfc1123.c Sun Jul 3 02:18:38 2005
485 #elif defined(_SQUID_AIX_)
486 #elif defined(_SQUID_CYGWIN_)
488 ! extern time_t timezone;
491 * The following assumes a fixed DST offset of 1 hour,
493 #elif defined(_SQUID_AIX_)
494 #elif defined(_SQUID_CYGWIN_)
496 ! extern long timezone;
499 * The following assumes a fixed DST offset of 1 hour,
500 Index: squid/lib/util.c
501 diff -c squid/lib/util.c:1.83.2.2 squid/lib/util.c:1.83.2.3
502 *** squid/lib/util.c:1.83.2.2 Sun Aug 11 19:22:37 2002
503 --- squid/lib/util.c Thu Jun 30 12:50:56 2005
506 xstrndup(const char *s, size_t n)
514 xstrndup(const char *s, size_t n)
521 Index: squid/snmplib/mib.c
522 diff -c squid/snmplib/mib.c:1.22.2.1 squid/snmplib/mib.c:1.22.2.2
523 *** squid/snmplib/mib.c:1.22.2.1 Wed Mar 9 07:33:02 2005
524 --- squid/snmplib/mib.c Thu Jun 30 12:50:56 2005
542 ! c1 = xtolower(*s1);
546 ! c2 = xtolower(*s2);
550 Index: squid/snmplib/parse.c
551 diff -c squid/snmplib/parse.c:1.26.2.1 squid/snmplib/parse.c:1.26.2.2
552 *** squid/snmplib/parse.c:1.26.2.1 Wed Mar 9 07:33:02 2005
553 --- squid/snmplib/parse.c Thu Jun 30 12:50:56 2005
567 ! #define SNMP_STATUS 22
573 {"read-only", sizeof("read-only") - 1, READONLY},
574 {"ACCESS", sizeof("ACCESS") - 1, ACCESS},
575 {"MAX-ACCESS", sizeof("MAX-ACCESS") - 1, ACCESS},
576 ! {"STATUS", sizeof("STATUS") - 1, STATUS},
577 {"SYNTAX", sizeof("SYNTAX") - 1, SYNTAX},
578 {"OBJECT-TYPE", sizeof("OBJECT-TYPE") - 1, OBJTYPE},
579 {"{", sizeof("{") - 1, LEFTBRACKET},
581 {"read-only", sizeof("read-only") - 1, READONLY},
582 {"ACCESS", sizeof("ACCESS") - 1, ACCESS},
583 {"MAX-ACCESS", sizeof("MAX-ACCESS") - 1, ACCESS},
584 ! {"STATUS", sizeof("STATUS") - 1, SNMP_STATUS},
585 {"SYNTAX", sizeof("SYNTAX") - 1, SYNTAX},
586 {"OBJECT-TYPE", sizeof("OBJECT-TYPE") - 1, OBJTYPE},
587 {"{", sizeof("{") - 1, LEFTBRACKET},
592 type = get_token(fp, token);
593 ! if (type != STATUS) {
594 print_error("Should be STATUS", token, nexttype);
600 type = get_token(fp, token);
601 ! if (type != SNMP_STATUS) {
602 print_error("Should be STATUS", token, nexttype);
605 Index: squid/src/cf_gen.c
606 diff -c squid/src/cf_gen.c:1.43.2.2 squid/src/cf_gen.c:1.43.2.3
607 *** squid/src/cf_gen.c:1.43.2.2 Thu Aug 22 06:28:15 2002
608 --- squid/src/cf_gen.c Thu Jun 30 12:50:56 2005
611 "\tconfig_lineno = 0;\n"
613 for (entry = head; entry != NULL; entry = entry->next) {
614 ! assert(entry->name);
615 assert(entry != entry->next);
617 if (!strcmp(entry->name, "comment"))
619 "\tconfig_lineno = 0;\n"
621 for (entry = head; entry != NULL; entry = entry->next) {
622 ! assert(entry->name != NULL);
623 assert(entry != entry->next);
625 if (!strcmp(entry->name, "comment"))
631 ! assert(entry->default_value);
633 fprintf(fp, "#if %s\n", entry->ifdef);
634 if (strcmp(entry->default_value, "none") == 0) {
639 ! assert(entry->default_value != NULL);
641 fprintf(fp, "#if %s\n", entry->ifdef);
642 if (strcmp(entry->default_value, "none") == 0) {
647 for (entry = head; entry != NULL; entry = entry->next) {
648 ! assert(entry->name);
649 ! assert(entry->loc);
650 if (entry->default_if_none == NULL)
656 for (entry = head; entry != NULL; entry = entry->next) {
657 ! assert(entry->name != NULL);
658 ! assert(entry->loc != NULL);
659 if (entry->default_if_none == NULL)
664 alias = entry->alias;
666 fprintf(fp, "\telse if (!strcmp(token, \"%s\"))\n", name);
667 ! assert(entry->loc);
668 if (strcmp(entry->loc, "none") == 0) {
672 alias = entry->alias;
674 fprintf(fp, "\telse if (!strcmp(token, \"%s\"))\n", name);
675 ! assert(entry->loc != NULL);
676 if (strcmp(entry->loc, "none") == 0) {
683 for (entry = head; entry != NULL; entry = entry->next) {
684 ! assert(entry->loc);
685 if (strcmp(entry->loc, "none") == 0)
687 if (strcmp(entry->name, "comment") == 0)
691 for (entry = head; entry != NULL; entry = entry->next) {
692 ! assert(entry->loc != NULL);
693 if (strcmp(entry->loc, "none") == 0)
695 if (strcmp(entry->name, "comment") == 0)
700 for (entry = head; entry != NULL; entry = entry->next) {
701 ! assert(entry->loc);
702 if (strcmp(entry->loc, "none") == 0)
704 if (strcmp(entry->name, "comment") == 0)
708 for (entry = head; entry != NULL; entry = entry->next) {
709 ! assert(entry->loc != NULL);
710 if (strcmp(entry->loc, "none") == 0)
712 if (strcmp(entry->name, "comment") == 0)
717 for (i = 0; strcmp(defines[i].name, name) != 0; i++) {
718 ! assert(defines[i].name);
720 return defines[i].defined;
725 for (i = 0; strcmp(defines[i].name, name) != 0; i++) {
726 ! assert(defines[i].name != NULL);
728 return defines[i].defined;
732 available_if(char *name)
736 for (i = 0; strcmp(defines[i].name, name) != 0; i++) {
737 ! assert(defines[i].name);
739 return defines[i].enable;
742 available_if(char *name)
745 ! assert(name != NULL);
746 for (i = 0; strcmp(defines[i].name, name) != 0; i++) {
747 ! assert(defines[i].name != NULL);
749 return defines[i].enable;
751 Index: squid/src/net_db.c
752 diff -c squid/src/net_db.c:1.158.2.9 squid/src/net_db.c:1.158.2.10
753 *** squid/src/net_db.c:1.158.2.9 Fri Mar 25 19:50:53 2005
754 --- squid/src/net_db.c Thu Jun 30 12:50:56 2005
758 /* skip reply headers */
759 if ((hdr_sz = headersEnd(p, size))) {
760 ! debug(38, 5) ("netdbExchangeHandleReply: hdr_sz = %d\n", hdr_sz);
761 rep = ex->e->mem_obj->reply;
762 if (0 == rep->sline.status)
763 httpReplyParse(rep, buf, hdr_sz);
766 /* skip reply headers */
767 if ((hdr_sz = headersEnd(p, size))) {
768 ! debug(38, 5) ("netdbExchangeHandleReply: hdr_sz = %ld\n", (long int) hdr_sz);
769 rep = ex->e->mem_obj->reply;
770 if (0 == rep->sline.status)
771 httpReplyParse(rep, buf, hdr_sz);
777 ! debug(38, 5) ("netdbExchangeHandleReply: start parsing loop, size = %d\n",
779 while (size >= rec_sz) {
780 ! debug(38, 5) ("netdbExchangeHandleReply: in parsing loop, size = %d\n",
782 addr.s_addr = any_addr.s_addr;
784 for (o = 0; o < rec_sz;) {
789 ! debug(38, 5) ("netdbExchangeHandleReply: start parsing loop, size = %ld\n",
791 while (size >= rec_sz) {
792 ! debug(38, 5) ("netdbExchangeHandleReply: in parsing loop, size = %ld\n",
794 addr.s_addr = any_addr.s_addr;
796 for (o = 0; o < rec_sz;) {