/*
- * $Id: AIODiskIOStrategy.cc,v 1.2 2005/03/10 21:49:20 serassio Exp $
+ * $Id: AIODiskIOStrategy.cc,v 1.3 2005/12/26 11:35:22 serassio Exp $
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
callback_valid = cbdataReferenceValidDone(aqe->aq_e_callback_data, &cbdata);
AIODiskFile * theFile = NULL;
void *theFileVoid = NULL;
- bool fileOk = cbdataReferenceValidDone(aqe->theFile, &theFileVoid);
+ void *theTmpFile = aqe->theFile;
+ bool fileOk = cbdataReferenceValidDone(theTmpFile, &theFileVoid);
if (fileOk) {
theFile = static_cast<AIODiskFile *>(theFileVoid);
/*
- * $Id: HttpHeader.cc,v 1.109 2005/12/13 21:41:57 wessels Exp $
+ * $Id: HttpHeader.cc,v 1.110 2005/12/26 11:35:22 serassio Exp $
*
* DEBUG: section 55 HTTP Header
* AUTHOR: Alex Rousskov
/* create masks */
httpHeaderMaskInit(&ListHeadersMask, 0);
- httpHeaderCalcMask(&ListHeadersMask, (const int *) ListHeadersArr, countof(ListHeadersArr));
+ httpHeaderCalcMask(&ListHeadersMask, ListHeadersArr, countof(ListHeadersArr));
httpHeaderMaskInit(&ReplyHeadersMask, 0);
- httpHeaderCalcMask(&ReplyHeadersMask, (const int *) ReplyHeadersArr, countof(ReplyHeadersArr));
+ httpHeaderCalcMask(&ReplyHeadersMask, ReplyHeadersArr, countof(ReplyHeadersArr));
- httpHeaderCalcMask(&ReplyHeadersMask, (const int *) GeneralHeadersArr, countof(GeneralHeadersArr));
+ httpHeaderCalcMask(&ReplyHeadersMask, GeneralHeadersArr, countof(GeneralHeadersArr));
- httpHeaderCalcMask(&ReplyHeadersMask, (const int *) EntityHeadersArr, countof(EntityHeadersArr));
+ httpHeaderCalcMask(&ReplyHeadersMask, EntityHeadersArr, countof(EntityHeadersArr));
httpHeaderMaskInit(&RequestHeadersMask, 0);
- httpHeaderCalcMask(&RequestHeadersMask, (const int *) RequestHeadersArr, countof(RequestHeadersArr));
+ httpHeaderCalcMask(&RequestHeadersMask, RequestHeadersArr, countof(RequestHeadersArr));
- httpHeaderCalcMask(&RequestHeadersMask, (const int *) GeneralHeadersArr, countof(GeneralHeadersArr));
+ httpHeaderCalcMask(&RequestHeadersMask, GeneralHeadersArr, countof(GeneralHeadersArr));
- httpHeaderCalcMask(&RequestHeadersMask, (const int *) EntityHeadersArr, countof(EntityHeadersArr));
+ httpHeaderCalcMask(&RequestHeadersMask, EntityHeadersArr, countof(EntityHeadersArr));
/* init header stats */
assert(HttpHeaderStatCount == hoReply + 1);
/*
- * $Id: HttpHeaderTools.cc,v 1.52 2005/11/04 20:27:31 wessels Exp $
+ * $Id: HttpHeaderTools.cc,v 1.53 2005/12/26 11:35:22 serassio Exp $
*
* DEBUG: section 66 HTTP Header Tools
* AUTHOR: Alex Rousskov
/* calculates a bit mask of a given array; does not reset mask! */
void
-httpHeaderCalcMask(HttpHeaderMask * mask, const int *enums, size_t count)
+httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], size_t count)
{
size_t i;
+ const int * enums = (const int *) http_hdr_type_enums;
assert(mask && enums);
assert(count < sizeof(*mask) * 8); /* check for overflow */
/*
- * $Id: HttpReply.cc,v 1.80 2005/11/21 22:49:04 wessels Exp $
+ * $Id: HttpReply.cc,v 1.81 2005/12/26 11:35:22 serassio Exp $
*
* DEBUG: section 58 HTTP Reply (Response)
* AUTHOR: Alex Rousskov
{
assert(HTTP_STATUS_NONE == 0); // HttpReply::parse() interface assumes that
httpHeaderMaskInit(&Denied304HeadersMask, 0);
- httpHeaderCalcMask(&Denied304HeadersMask, (const int *) Denied304HeadersArr, countof(Denied304HeadersArr));
+ httpHeaderCalcMask(&Denied304HeadersMask, Denied304HeadersArr, countof(Denied304HeadersArr));
}
HttpReply::HttpReply() : HttpMsg(hoReply), date (0), last_modified (0), expires (0), surrogate_control (NULL), content_range (NULL), keep_alive (0), protoPrefix("HTTP/")
/*
- * $Id: cache_cf.cc,v 1.486 2005/11/21 23:10:22 wessels Exp $
+ * $Id: cache_cf.cc,v 1.487 2005/12/26 11:35:22 serassio Exp $
*
* DEBUG: section 3 Configuration File Parsing
* AUTHOR: Harvest Derived
}
}
- while (*head)
- head = (https_port_list **)&(*head)->http.next;
+ while (*head) {
+ http_port_list ** headTmp = &(*head)->http.next;
+ head = (https_port_list **)headTmp;
+ }
*head = s;
}
/*
- * $Id: peer_digest.cc,v 1.105 2005/11/05 00:08:32 wessels Exp $
+ * $Id: peer_digest.cc,v 1.106 2005/12/26 11:35:22 serassio Exp $
*
* DEBUG: section 72 Peer Digest Routines
* AUTHOR: Alex Rousskov
static void
peerDigestDestroy(PeerDigest * pd)
{
- peer *p;
+ void *p;
assert(pd);
+ void * peerTmp = pd->peer;
/* inform peer (if any) that we are gone */
- if (cbdataReferenceValidDone(pd->peer, (void **) &p))
- peerNoteDigestGone(p);
+ if (cbdataReferenceValidDone(peerTmp, &p))
+ peerNoteDigestGone((peer *)p);
peerDigestClean(pd);
/*
- * $Id: protos.h,v 1.515 2005/12/06 23:03:34 wessels Exp $
+ * $Id: protos.h,v 1.516 2005/12/26 11:35:22 serassio Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
SQUIDCEXTERN http_hdr_type httpHeaderIdByNameDef(const char *name, int name_len);
SQUIDCEXTERN const char *httpHeaderNameById(int id);
SQUIDCEXTERN void httpHeaderMaskInit(HttpHeaderMask * mask, int value);
-SQUIDCEXTERN void httpHeaderCalcMask(HttpHeaderMask * mask, const int *enums, size_t count);
+SQUIDCEXTERN void httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], size_t count);
SQUIDCEXTERN int httpHeaderHasConnDir(const HttpHeader * hdr, const char *directive);
SQUIDCEXTERN void strListAdd(String * str, const char *item, char del);
SQUIDCEXTERN int strListIsMember(const String * str, const char *item, char del);
/*
- * $Id: snmp_core.cc,v 1.72 2005/12/09 01:02:24 wessels Exp $
+ * $Id: snmp_core.cc,v 1.73 2005/12/26 11:35:22 serassio Exp $
*
* DEBUG: section 49 SNMP support
* AUTHOR: Glenn Chisholm
xfree(NextOidName);
}
- VarNew = (*ParseFn) (VarPtr, (snint *) & (Answer->errstat));
+ int * errstatTmp = &(Answer->errstat);
+
+ VarNew = (*ParseFn) (VarPtr, (snint *) errstatTmp);
if (get_next)
snmp_var_free(VarPtr);