1 Index: squid/lib/radix.c
2 diff -c squid/lib/radix.c:1.16 squid/lib/radix.c:1.16.2.1
3 *** squid/lib/radix.c:1.16 Tue Nov 13 12:24:34 2001
4 --- squid/lib/radix.c Wed Jun 18 17:53:34 2003
11 struct squid_radix_mask *squid_rn_mkfreelist;
12 ! struct squid_radix_node_head *squid_mask_rnhead;
13 static char *addmask_key;
14 static unsigned char normal_chars[] =
15 {0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xFF};
22 struct squid_radix_mask *squid_rn_mkfreelist;
23 ! /* Silly construct to get rid of GCC-3.3 warning about type-punning */
25 ! struct squid_radix_node_head *rn;
27 ! } squid_mask_rnhead_u;
28 ! #define squid_mask_rnhead squid_mask_rnhead_u.rn
29 static char *addmask_key;
30 static unsigned char normal_chars[] =
31 {0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xFF};
34 addmask_key = cplim = rn_ones + squid_max_keylen;
37 ! if (squid_rn_inithead((void **) &squid_mask_rnhead, 0) == 0) {
38 fprintf(stderr, "rn_init2 failed.\n");
42 addmask_key = cplim = rn_ones + squid_max_keylen;
45 ! if (squid_rn_inithead(&squid_mask_rnhead_u.ptr, 0) == 0) {
46 fprintf(stderr, "rn_init2 failed.\n");
49 Index: squid/lib/rfc1738.c
50 diff -c squid/lib/rfc1738.c:1.23 squid/lib/rfc1738.c:1.23.2.1
51 *** squid/lib/rfc1738.c:1.23 Wed Feb 7 11:56:51 2001
52 --- squid/lib/rfc1738.c Wed Jun 18 17:53:34 2003
57 /* RFC 1738 says any non-US-ASCII are encoded */
58 ! if (((unsigned char) *p >= (unsigned char) 0x80) &&
59 ! ((unsigned char) *p <= (unsigned char) 0xFF)) {
62 /* Do the triplet encoding, or just copy the char */
66 /* RFC 1738 says any non-US-ASCII are encoded */
67 ! if (((unsigned char) *p >= (unsigned char) 0x80)) {
70 /* Do the triplet encoding, or just copy the char */
71 Index: squid/src/asn.c
72 diff -c squid/src/asn.c:1.78 squid/src/asn.c:1.78.2.1
73 *** squid/src/asn.c:1.78 Tue Nov 13 12:24:35 2001
74 --- squid/src/asn.c Wed Jun 18 17:53:34 2003
77 /* END of definitions for radix tree entries */
79 /* Head for ip to asn radix tree */
80 ! struct squid_radix_node_head *AS_tree_head;
83 * Structure for as number information. it could be simply
85 /* END of definitions for radix tree entries */
87 /* Head for ip to asn radix tree */
88 ! /* Silly union construct to get rid of GCC-3.3 warning */
90 ! struct squid_radix_node_head *rn;
94 ! #define AS_tree_head AS_tree_head_u.rn
97 * Structure for as number information. it could be simply
100 CBDATA_INIT_TYPE(ASState);
103 ! squid_rn_inithead((void **) &AS_tree_head, 8);
104 asnAclInitialize(Config.aclList);
105 cachemgrRegister("asndb", "AS Number Database", asnStats, 0, 1);
108 CBDATA_INIT_TYPE(ASState);
111 ! squid_rn_inithead(&AS_tree_head_u.ptr, 8);
112 asnAclInitialize(Config.aclList);
113 cachemgrRegister("asndb", "AS Number Database", asnStats, 0, 1);
115 Index: squid/src/delay_pools.c
116 diff -c squid/src/delay_pools.c:1.19.2.7 squid/src/delay_pools.c:1.19.2.8
117 *** squid/src/delay_pools.c:1.19.2.7 Sun Mar 9 11:41:27 2003
118 --- squid/src/delay_pools.c Wed Jun 18 17:53:35 2003
122 if (!(delay_data[pool].class3->individual_255_used[i / 8] & (1 << (i % 8)))) {
123 delay_data[pool].class3->individual_255_used[i / 8] |= (1 << (i % 8));
124 - assert(position < C3_IND_SZ);
125 delay_data[pool].class3->individual[position] =
126 (int) (((double) Config.Delay.rates[pool]->individual.max_bytes *
127 Config.Delay.initial) / 100);
131 assert(j < (IND_MAP_SZ - 1));
132 delay_data[pool].class3->individual_map[i][j + 1] = 255;
134 - assert(position < C3_IND_SZ);
135 delay_data[pool].class3->individual[position] =
136 (int) (((double) Config.Delay.rates[pool]->individual.max_bytes *
137 Config.Delay.initial) / 100);
139 Index: squid/src/snmp_core.c
140 diff -c squid/src/snmp_core.c:1.51.2.2 squid/src/snmp_core.c:1.51.2.3
141 *** squid/src/snmp_core.c:1.51.2.2 Thu Feb 14 12:02:17 2002
142 --- squid/src/snmp_core.c Wed Jun 18 17:53:35 2003
146 } else if (PDU->command == SNMP_PDU_GETNEXT) {
147 oid *NextOidName = NULL;
148 ! int NextOidNameLen = 0;
150 ParseFn = snmpTreeNext(PDU->variables->name, PDU->variables->name_length,
151 ! &(NextOidName), (snint *) & NextOidNameLen);
153 if (ParseFn == NULL) {
154 Answer->errstat = SNMP_ERR_NOSUCHNAME;
157 } else if (PDU->command == SNMP_PDU_GETNEXT) {
158 oid *NextOidName = NULL;
159 ! snint NextOidNameLen = 0;
161 ParseFn = snmpTreeNext(PDU->variables->name, PDU->variables->name_length,
162 ! &NextOidName, &NextOidNameLen);
164 if (ParseFn == NULL) {
165 Answer->errstat = SNMP_ERR_NOSUCHNAME;