]> git.pld-linux.org Git - packages/squid.git/blame - squid-2.5.STABLE10-64bit_cleanup.patch
projects / packages / squid.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- updated to 2.5.STABLE11
[packages/squid.git] / squid-2.5.STABLE10-64bit_cleanup.patch
CommitLineData
d29ec517 1Index: squid/helpers/basic_auth/MSNT/smblib.c
2diff -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
5***************
6*** 127,138 ****
7 * service we are going to call, sine some servers want it in uppercase */
8
9 for (i = 0; i < strlen(server); i++)
10! called[i] = toupper(server[i]);
11
12 called[strlen(server)] = 0; /* Make it a string */
13
14 for (i = 0; i < strlen(con->myname); i++)
15! calling[i] = toupper(con->myname[i]);
16
17 calling[strlen(con->myname)] = 0; /* Make it a string */
18
19--- 127,138 ----
20 * service we are going to call, sine some servers want it in uppercase */
21
22 for (i = 0; i < strlen(server); i++)
23! called[i] = xtoupper(server[i]);
24
25 called[strlen(server)] = 0; /* Make it a string */
26
27 for (i = 0; i < strlen(con->myname); i++)
28! calling[i] = xtoupper(con->myname[i]);
29
30 calling[strlen(con->myname)] = 0; /* Make it a string */
31
32***************
33*** 229,240 ****
34 * service we are going to call, sine some servers want it in uppercase */
35
36 for (i = 0; i < strlen(host); i++)
37! called[i] = toupper(host[i]);
38
39 called[strlen(host)] = 0; /* Make it a string */
40
41 for (i = 0; i < strlen(con->myname); i++)
42! calling[i] = toupper(con->myname[i]);
43
44 calling[strlen(con->myname)] = 0; /* Make it a string */
45
46--- 229,240 ----
47 * service we are going to call, sine some servers want it in uppercase */
48
49 for (i = 0; i < strlen(host); i++)
50! called[i] = xtoupper(host[i]);
51
52 called[strlen(host)] = 0; /* Make it a string */
53
54 for (i = 0; i < strlen(con->myname); i++)
55! calling[i] = xtoupper(con->myname[i]);
56
57 calling[strlen(con->myname)] = 0; /* Make it a string */
58
59Index: squid/helpers/basic_auth/MSNT/smblib.h
60diff -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
63***************
64*** 23,28 ****
65--- 23,29 ----
66 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
67 */
68
69+ #include "util.h"
70 #include "std-defines.h"
71 #include "smblib-common.h"
72
73Index: squid/helpers/external_acl/winbind_group/wb_check_group.c
74diff -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
77***************
78*** 127,133 ****
79
80 static int strCaseCmp (const char *s1, const char *s2)
81 {
82! while (*s1 && toupper (*s1) == toupper (*s2)) s1++, s2++;
83 return *s1 - *s2;
84 }
85
86--- 127,133 ----
87
88 static int strCaseCmp (const char *s1, const char *s2)
89 {
90! while (*s1 && xtoupper (*s1) == xtoupper (*s2)) s1++, s2++;
91 return *s1 - *s2;
92 }
93
94Index: squid/helpers/ntlm_auth/SMB/ntlm_auth.c
95diff -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
98***************
99*** 81,87 ****
100 {
101 char *p = string, c;
102 while ((c = *p)) {
103! *p = toupper(c);
104 p++;
105 }
106 }
107--- 81,87 ----
108 {
109 char *p = string, c;
110 while ((c = *p)) {
111! *p = xtoupper(c);
112 p++;
113 }
114 }
115***************
116*** 92,98 ****
117 {
118 char *p = string, c;
119 while ((c = *p)) {
120! *p = tolower(c);
121 p++;
122 }
123 }
124--- 92,98 ----
125 {
126 char *p = string, c;
127 while ((c = *p)) {
128! *p = xtolower(c);
129 p++;
130 }
131 }
132Index: squid/helpers/ntlm_auth/SMB/smbval/smbencrypt.c
133diff -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
136***************
137*** 200,206 ****
138 * #endif *//* KANJI_WIN95_COMPATIBILITY */
139 {
140 if (islower((int)(unsigned char)*s))
141! *s = toupper(*s);
142 s++;
143 }
144 }
145--- 200,206 ----
146 * #endif *//* KANJI_WIN95_COMPATIBILITY */
147 {
148 if (islower((int)(unsigned char)*s))
149! *s = xtoupper(*s);
150 s++;
151 }
152 }
153Index: squid/helpers/ntlm_auth/SMB/smbval/smblib.c
154diff -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
157***************
158*** 170,181 ****
159 * service we are going to call, sine some servers want it in uppercase */
160
161 for (i = 0; i < strlen(server); i++)
162! called[i] = toupper(server[i]);
163
164 called[strlen(server)] = 0; /* Make it a string */
165
166 for (i = 0; i < strlen(con->myname); i++)
167! calling[i] = toupper(con->myname[i]);
168
169 calling[strlen(con->myname)] = 0; /* Make it a string */
170
171--- 170,181 ----
172 * service we are going to call, sine some servers want it in uppercase */
173
174 for (i = 0; i < strlen(server); i++)
175! called[i] = xtoupper(server[i]);
176
177 called[strlen(server)] = 0; /* Make it a string */
178
179 for (i = 0; i < strlen(con->myname); i++)
180! calling[i] = xtoupper(con->myname[i]);
181
182 calling[strlen(con->myname)] = 0; /* Make it a string */
183
184***************
185*** 271,282 ****
186 * service we are going to call, sine some servers want it in uppercase */
187
188 for (i = 0; i < strlen(host); i++)
189! called[i] = toupper(host[i]);
190
191 called[strlen(host)] = 0; /* Make it a string */
192
193 for (i = 0; i < strlen(con->myname); i++)
194! calling[i] = toupper(con->myname[i]);
195
196 calling[strlen(con->myname)] = 0; /* Make it a string */
197
198--- 271,282 ----
199 * service we are going to call, sine some servers want it in uppercase */
200
201 for (i = 0; i < strlen(host); i++)
202! called[i] = xtoupper(host[i]);
203
204 called[strlen(host)] = 0; /* Make it a string */
205
206 for (i = 0; i < strlen(con->myname); i++)
207! calling[i] = xtoupper(con->myname[i]);
208
209 calling[strlen(con->myname)] = 0; /* Make it a string */
210
211Index: squid/helpers/ntlm_auth/SMB/smbval/std-includes.h
212diff -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
215***************
216*** 25,30 ****
217--- 25,31 ----
218
219 /* the types are provided by squid's configure preocess */
220 #include "squid_types.h"
221+ #include "util.h"
222 #define BOOL int16_t
223 #define int16 int16_t
224
225Index: squid/helpers/ntlm_auth/fakeauth/fakeauth_auth.c
226diff -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
229***************
230*** 57,63 ****
231 char *p = string;
232 char c;
233 while ((c = *p)) {
234! *p = tolower(c);
235 p++;
236 }
237 }
238--- 57,63 ----
239 char *p = string;
240 char c;
241 while ((c = *p)) {
242! *p = xtolower(c);
243 p++;
244 }
245 }
246Index: squid/helpers/ntlm_auth/winbind/wb_ntlm_auth.c
247diff -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
250***************
251*** 87,93 ****
252 {
253 char *p = string, c;
254 while ((c = *p)) {
255! *p = tolower(c);
256 p++;
257 }
258 }
259--- 87,93 ----
260 {
261 char *p = string, c;
262 while ((c = *p)) {
263! *p = xtolower(c);
264 p++;
265 }
266 }
267***************
268*** 97,103 ****
269 {
270 char *p = string, c;
271 while ((c = *p)) {
272! *p = toupper(c);
273 p++;
274 }
275 }
276--- 97,103 ----
277 {
278 char *p = string, c;
279 while ((c = *p)) {
280! *p = xtoupper(c);
281 p++;
282 }
283 }
284Index: squid/lib/Array.c
285diff -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
288***************
289*** 65,78 ****
290 void
291 arrayInit(Array * a)
292 {
293! assert(a);
294 memset(a, 0, sizeof(Array));
295 }
296
297 void
298 arrayClean(Array * a)
299 {
300! assert(a);
301 /* could also warn if some objects are left */
302 xfree(a->items);
303 a->items = NULL;
304--- 65,78 ----
305 void
306 arrayInit(Array * a)
307 {
308! assert(a != NULL);
309 memset(a, 0, sizeof(Array));
310 }
311
312 void
313 arrayClean(Array * a)
314 {
315! assert(a != NULL);
316 /* could also warn if some objects are left */
317 xfree(a->items);
318 a->items = NULL;
319***************
320*** 81,87 ****
321 void
322 arrayDestroy(Array * a)
323 {
324! assert(a);
325 arrayClean(a);
326 xfree(a);
327 }
328--- 81,87 ----
329 void
330 arrayDestroy(Array * a)
331 {
332! assert(a != NULL);
333 arrayClean(a);
334 xfree(a);
335 }
336***************
337*** 89,95 ****
338 void
339 arrayAppend(Array * a, void *obj)
340 {
341! assert(a);
342 if (a->count >= a->capacity)
343 arrayGrow(a, a->count + 1);
344 a->items[a->count++] = obj;
345--- 89,95 ----
346 void
347 arrayAppend(Array * a, void *obj)
348 {
349! assert(a != NULL);
350 if (a->count >= a->capacity)
351 arrayGrow(a, a->count + 1);
352 a->items[a->count++] = obj;
353***************
354*** 97,103 ****
355
356 void arrayInsert(Array *a, void *obj, int position)
357 {
358! assert(a);
359 if (a->count >= a->capacity)
360 arrayGrow(a, a->count + 1);
361 if (position > a->count)
362--- 97,103 ----
363
364 void arrayInsert(Array *a, void *obj, int position)
365 {
366! assert(a != NULL);
367 if (a->count >= a->capacity)
368 arrayGrow(a, a->count + 1);
369 if (position > a->count)
370***************
371*** 112,118 ****
372 void
373 arrayPreAppend(Array * a, int app_count)
374 {
375! assert(a);
376 if (a->count + app_count > a->capacity)
377 arrayGrow(a, a->count + app_count);
378 }
379--- 112,118 ----
380 void
381 arrayPreAppend(Array * a, int app_count)
382 {
383! assert(a != NULL);
384 if (a->count + app_count > a->capacity)
385 arrayGrow(a, a->count + app_count);
386 }
387Index: squid/lib/Stack.c
388diff -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
391***************
392*** 50,62 ****
393 void *
394 stackPop(Stack * s)
395 {
396! assert(s);
397 return s->count ? s->items[--s->count] : NULL;
398 }
399
400 void *
401 stackTop(Stack * s)
402 {
403! assert(s);
404 return s->count ? s->items[s->count - 1] : NULL;
405 }
406--- 50,62 ----
407 void *
408 stackPop(Stack * s)
409 {
410! assert(s != NULL);
411 return s->count ? s->items[--s->count] : NULL;
412 }
413
414 void *
415 stackTop(Stack * s)
416 {
417! assert(s != NULL);
418 return s->count ? s->items[s->count - 1] : NULL;
419 }
420Index: squid/lib/hash.c
421diff -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
424***************
425*** 239,245 ****
426 void
427 hash_last(hash_table * hid)
428 {
429! assert(hid);
430 hid->next = NULL;
431 hid->current_slot = 0;
432 }
433--- 239,245 ----
434 void
435 hash_last(hash_table * hid)
436 {
437! assert(hid != NULL);
438 hid->next = NULL;
439 hid->current_slot = 0;
440 }
441***************
442*** 307,313 ****
443 void
444 hashFreeMemory(hash_table * hid)
445 {
446! assert(hid);
447 if (hid->buckets)
448 xfree(hid->buckets);
449 xfree(hid);
450--- 307,313 ----
451 void
452 hashFreeMemory(hash_table * hid)
453 {
454! assert(hid != NULL);
455 if (hid->buckets)
456 xfree(hid->buckets);
457 xfree(hid);
458Index: squid/lib/heap.c
459diff -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
462***************
463*** 122,128 ****
464 delete_heap(heap * hp)
465 {
466 int i;
467! assert(hp);
468 for (i = 0; i < hp->last; i++) {
469 xfree(hp->nodes[i]);
470 }
471--- 122,128 ----
472 delete_heap(heap * hp)
473 {
474 int i;
475! assert(hp != NULL);
476 for (i = 0; i < hp->last; i++) {
477 xfree(hp->nodes[i]);
478 }
479Index: squid/lib/rfc1123.c
480diff -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
483***************
484*** 230,236 ****
485 #elif defined(_SQUID_AIX_)
486 #elif defined(_SQUID_CYGWIN_)
487 #else
488! extern time_t timezone;
489 #endif
490 /*
491 * The following assumes a fixed DST offset of 1 hour,
492--- 230,236 ----
493 #elif defined(_SQUID_AIX_)
494 #elif defined(_SQUID_CYGWIN_)
495 #else
496! extern long timezone;
497 #endif
498 /*
499 * The following assumes a fixed DST offset of 1 hour,
500Index: squid/lib/util.c
501diff -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
504***************
505*** 608,614 ****
506 xstrndup(const char *s, size_t n)
507 {
508 size_t sz;
509! assert(s);
510 assert(n);
511 sz = strlen(s) + 1;
512 if (sz > n)
513--- 608,614 ----
514 xstrndup(const char *s, size_t n)
515 {
516 size_t sz;
517! assert(s != NULL);
518 assert(n);
519 sz = strlen(s) + 1;
520 if (sz > n)
521Index: squid/snmplib/mib.c
522diff -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
525***************
526*** 128,138 ****
527
528 while (*s1 && *s2) {
529 if (xisupper(*s1))
530! c1 = tolower(*s1);
531 else
532 c1 = *s1;
533 if (xisupper(*s2))
534! c2 = tolower(*s2);
535 else
536 c2 = *s2;
537 if (c1 != c2)
538--- 128,138 ----
539
540 while (*s1 && *s2) {
541 if (xisupper(*s1))
542! c1 = xtolower(*s1);
543 else
544 c1 = *s1;
545 if (xisupper(*s2))
546! c2 = xtolower(*s2);
547 else
548 c2 = *s2;
549 if (c1 != c2)
550Index: squid/snmplib/parse.c
551diff -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
554***************
555*** 135,141 ****
556 #define WRITEONLY 20
557 #undef NOACCESS
558 #define NOACCESS 21
559! #define STATUS 22
560 #define MANDATORY 23
561 #define OPTIONAL 24
562 #define OBSOLETE 25
563--- 135,141 ----
564 #define WRITEONLY 20
565 #undef NOACCESS
566 #define NOACCESS 21
567! #define SNMP_STATUS 22
568 #define MANDATORY 23
569 #define OPTIONAL 24
570 #define OBSOLETE 25
571***************
572*** 193,199 ****
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},
580--- 193,199 ----
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},
588***************
589*** 867,873 ****
590 return 0;
591 }
592 type = get_token(fp, token);
593! if (type != STATUS) {
594 print_error("Should be STATUS", token, nexttype);
595 free_node(np);
596 return 0;
597--- 867,873 ----
598 return 0;
599 }
600 type = get_token(fp, token);
601! if (type != SNMP_STATUS) {
602 print_error("Should be STATUS", token, nexttype);
603 free_node(np);
604 return 0;
605Index: squid/src/cf_gen.c
606diff -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
609***************
610*** 403,409 ****
611 "\tconfig_lineno = 0;\n"
612 );
613 for (entry = head; entry != NULL; entry = entry->next) {
614! assert(entry->name);
615 assert(entry != entry->next);
616
617 if (!strcmp(entry->name, "comment"))
618--- 403,409 ----
619 "\tconfig_lineno = 0;\n"
620 );
621 for (entry = head; entry != NULL; entry = entry->next) {
622! assert(entry->name != NULL);
623 assert(entry != entry->next);
624
625 if (!strcmp(entry->name, "comment"))
626***************
627*** 418,424 ****
628 rc |= 1;
629 continue;
630 }
631! assert(entry->default_value);
632 if (entry->ifdef)
633 fprintf(fp, "#if %s\n", entry->ifdef);
634 if (strcmp(entry->default_value, "none") == 0) {
635--- 418,424 ----
636 rc |= 1;
637 continue;
638 }
639! assert(entry->default_value != NULL);
640 if (entry->ifdef)
641 fprintf(fp, "#if %s\n", entry->ifdef);
642 if (strcmp(entry->default_value, "none") == 0) {
643***************
644*** 447,454 ****
645 "{\n"
646 );
647 for (entry = head; entry != NULL; entry = entry->next) {
648! assert(entry->name);
649! assert(entry->loc);
650 if (entry->default_if_none == NULL)
651 continue;
652 if (entry->ifdef)
653--- 447,454 ----
654 "{\n"
655 );
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)
660 continue;
661 if (entry->ifdef)
662***************
663*** 498,504 ****
664 alias = entry->alias;
665 next_alias:
666 fprintf(fp, "\telse if (!strcmp(token, \"%s\"))\n", name);
667! assert(entry->loc);
668 if (strcmp(entry->loc, "none") == 0) {
669 fprintf(fp,
670 "\t\tparse_%s();\n",
671--- 498,504 ----
672 alias = entry->alias;
673 next_alias:
674 fprintf(fp, "\telse if (!strcmp(token, \"%s\"))\n", name);
675! assert(entry->loc != NULL);
676 if (strcmp(entry->loc, "none") == 0) {
677 fprintf(fp,
678 "\t\tparse_%s();\n",
679***************
680*** 538,544 ****
681 "{\n"
682 );
683 for (entry = head; entry != NULL; entry = entry->next) {
684! assert(entry->loc);
685 if (strcmp(entry->loc, "none") == 0)
686 continue;
687 if (strcmp(entry->name, "comment") == 0)
688--- 538,544 ----
689 "{\n"
690 );
691 for (entry = head; entry != NULL; entry = entry->next) {
692! assert(entry->loc != NULL);
693 if (strcmp(entry->loc, "none") == 0)
694 continue;
695 if (strcmp(entry->name, "comment") == 0)
696***************
697*** 565,571 ****
698 "{\n"
699 );
700 for (entry = head; entry != NULL; entry = entry->next) {
701! assert(entry->loc);
702 if (strcmp(entry->loc, "none") == 0)
703 continue;
704 if (strcmp(entry->name, "comment") == 0)
705--- 565,571 ----
706 "{\n"
707 );
708 for (entry = head; entry != NULL; entry = entry->next) {
709! assert(entry->loc != NULL);
710 if (strcmp(entry->loc, "none") == 0)
711 continue;
712 if (strcmp(entry->name, "comment") == 0)
713***************
714*** 588,594 ****
715 if (!name)
716 return 1;
717 for (i = 0; strcmp(defines[i].name, name) != 0; i++) {
718! assert(defines[i].name);
719 }
720 return defines[i].defined;
721 }
722--- 588,594 ----
723 if (!name)
724 return 1;
725 for (i = 0; strcmp(defines[i].name, name) != 0; i++) {
726! assert(defines[i].name != NULL);
727 }
728 return defines[i].defined;
729 }
730***************
731*** 597,605 ****
732 available_if(char *name)
733 {
734 int i = 0;
735! assert(name);
736 for (i = 0; strcmp(defines[i].name, name) != 0; i++) {
737! assert(defines[i].name);
738 }
739 return defines[i].enable;
740 }
741--- 597,605 ----
742 available_if(char *name)
743 {
744 int i = 0;
745! assert(name != NULL);
746 for (i = 0; strcmp(defines[i].name, name) != 0; i++) {
747! assert(defines[i].name != NULL);
748 }
749 return defines[i].enable;
750 }
751Index: squid/src/net_db.c
752diff -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
755***************
756*** 556,562 ****
757 if (0 == ex->used) {
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);
764--- 556,562 ----
765 if (0 == ex->used) {
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);
772***************
773*** 574,584 ****
774 size = 0;
775 }
776 }
777! debug(38, 5) ("netdbExchangeHandleReply: start parsing loop, size = %d\n",
778! size);
779 while (size >= rec_sz) {
780! debug(38, 5) ("netdbExchangeHandleReply: in parsing loop, size = %d\n",
781! size);
782 addr.s_addr = any_addr.s_addr;
783 hops = rtt = 0.0;
784 for (o = 0; o < rec_sz;) {
785--- 574,584 ----
786 size = 0;
787 }
788 }
789! debug(38, 5) ("netdbExchangeHandleReply: start parsing loop, size = %ld\n",
790! (long int) size);
791 while (size >= rec_sz) {
792! debug(38, 5) ("netdbExchangeHandleReply: in parsing loop, size = %ld\n",
793! (long int) size);
794 addr.s_addr = any_addr.s_addr;
795 hops = rtt = 0.0;
796 for (o = 0; o < rec_sz;) {
SQUID Internet Object Cache
This page took 0.109659 seconds and 4 git commands to generate.