From: Francesco Chemolli Date: Thu, 12 Feb 2009 10:46:08 +0000 (+0100) Subject: unsafeBuf is no more. X-Git-Tag: SQUID_3_2_0_1~1189^2~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b41978659e2ba47813ce143d6141e553d1fdb431;p=thirdparty%2Fsquid.git unsafeBuf is no more. Reverted shortening of size_type to unisgned int, due to issue with std::string::npos. --- diff --git a/src/SquidString.h b/src/SquidString.h index 0aac98957b..897ce13d72 100644 --- a/src/SquidString.h +++ b/src/SquidString.h @@ -92,7 +92,7 @@ public: String (String const &); ~String(); - typedef unsigned int size_type; //storage size intentionally unspecified + typedef size_t size_type; //storage size intentionally unspecified String &operator =(char const *); String &operator =(String const &); @@ -109,7 +109,6 @@ public: /// variant of size() suited to be used for printf-alikes. /// throws when size() > MAXINT int psize() const; - _SQUID_INLINE_ char const * unsafeBuf() const; /** * \retval true the String has some contents diff --git a/src/String.cci b/src/String.cci index 263fd9931b..adbf8916de 100644 --- a/src/String.cci +++ b/src/String.cci @@ -58,12 +58,6 @@ String::size() const return len_; } -char const * -String::unsafeBuf() const -{ - return buf_; -} - bool String::defined() const { return buf_!=NULL; diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc index ac5f17ee23..1ae4ee4863 100644 --- a/src/adaptation/Config.cc +++ b/src/adaptation/Config.cc @@ -68,8 +68,11 @@ Adaptation::Config::dumpService(StoreEntry *entry, const char *name) const typedef Services::iterator SCI; for (SCI i = AllServices().begin(); i != AllServices().end(); ++i) { const ServiceConfig &cfg = (*i)->cfg(); - storeAppendPrintf(entry, "%s %.*s_%s %s %d %.*s\n", name, cfg.key.size(), cfg.key.rawBuf(), - cfg.methodStr(), cfg.vectPointStr(), cfg.bypass, cfg.uri.size(), cfg.uri.rawBuf()); + storeAppendPrintf(entry, "%s " SQUIDSTRINGPH "_%s %s %d " SQUIDSTRINGPH "\n", + name, + SQUIDSTRINGPRINT(cfg.key), + cfg.methodStr(), cfg.vectPointStr(), cfg.bypass, + SQUIDSTRINGPRINT(cfg.uri)); } } diff --git a/src/peer_digest.cc b/src/peer_digest.cc index d8b510bb7d..4f009ec93e 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -279,7 +279,7 @@ peerDigestCheck(void *data) /* per-peer limit */ if (req_time - pd->times.received < PeerDigestReqMinGap) { - debugs(72, 2, "peerDigestCheck: " << pd->host.unsafeBuf() << + debugs(72, 2, "peerDigestCheck: " << pd->host << ", avoiding close peer requests (" << (int) (req_time - pd->times.received) << " < " << (int) PeerDigestReqMinGap << " secs)."); @@ -289,7 +289,7 @@ peerDigestCheck(void *data) /* global limit */ if (req_time - pd_last_req_time < GlobDigestReqMinGap) { - debugs(72, 2, "peerDigestCheck: " << pd->host.unsafeBuf() << + debugs(72, 2, "peerDigestCheck: " << pd->host << ", avoiding close requests (" << (int) (req_time - pd_last_req_time) << " < " << (int) GlobDigestReqMinGap << " secs)."); @@ -544,7 +544,7 @@ peerDigestFetchReply(void *data, char *buf, ssize_t size) assert(reply); assert (reply->sline.status != 0); status = reply->sline.status; - debugs(72, 3, "peerDigestFetchReply: " << pd->host.unsafeBuf() << " status: " << status << + debugs(72, 3, "peerDigestFetchReply: " << pd->host << " status: " << status << ", expires: " << (long int) reply->expires << " (" << std::showpos << (int) (reply->expires - squid_curtime) << ")"); @@ -634,7 +634,7 @@ peerDigestSwapInHeaders(void *data, char *buf, ssize_t size) assert (fetch->entry->getReply()->sline.status != 0); if (fetch->entry->getReply()->sline.status != HTTP_OK) { - debugs(72, 1, "peerDigestSwapInHeaders: " << fetch->pd->host.unsafeBuf() << + debugs(72, 1, "peerDigestSwapInHeaders: " << fetch->pd->host << " status " << fetch->entry->getReply()->sline.status << " got cached!"); @@ -762,7 +762,7 @@ peerDigestFetchedEnough(DigestFetchState * fetch, char *buf, ssize_t size, const #endif else - host = pd->host.unsafeBuf(); + host = pd->host.termedBuf(); } debugs(72, 6, step_name << ": peer " << host << ", offset: " << @@ -813,7 +813,7 @@ static void peerDigestFetchStop(DigestFetchState * fetch, char *buf, const char *reason) { assert(reason); - debugs(72, 2, "peerDigestFetchStop: peer " << fetch->pd->host.unsafeBuf() << ", reason: " << reason); + debugs(72, 2, "peerDigestFetchStop: peer " << fetch->pd->host << ", reason: " << reason); peerDigestReqFinish(fetch, buf, 1, 1, 1, reason, 0); } @@ -822,7 +822,7 @@ static void peerDigestFetchAbort(DigestFetchState * fetch, char *buf, const char *reason) { assert(reason); - debugs(72, 2, "peerDigestFetchAbort: peer " << fetch->pd->host.unsafeBuf() << ", reason: " << reason); + debugs(72, 2, "peerDigestFetchAbort: peer " << fetch->pd->host << ", reason: " << reason); peerDigestReqFinish(fetch, buf, 1, 1, 1, reason, 1); } @@ -872,7 +872,7 @@ static void peerDigestPDFinish(DigestFetchState * fetch, int pcb_valid, int err) { PeerDigest *pd = fetch->pd; - const char *host = pd->host.unsafeBuf(); + const char *host = pd->host.termedBuf(); pd->times.received = squid_curtime; pd->times.req_delay = fetch->resp_time; @@ -986,7 +986,7 @@ peerDigestSetCBlock(PeerDigest * pd, const char *buf) { StoreDigestCBlock cblock; int freed_size = 0; - const char *host = pd->host.unsafeBuf(); + const char *host = pd->host.termedBuf(); xmemcpy(&cblock, buf, sizeof(cblock)); /* network -> host conversions */ @@ -1080,7 +1080,7 @@ peerDigestUseful(const PeerDigest * pd) const int bit_util = cacheDigestBitUtil(pd->cd); if (bit_util > 65) { - debugs(72, 0, "Warning: " << pd->host.unsafeBuf() << + debugs(72, 0, "Warning: " << pd->host << " peer digest has too many bits on (" << bit_util << "%%)."); return 0; @@ -1106,7 +1106,7 @@ peerDigestStatsReport(const PeerDigest * pd, StoreEntry * e) assert(pd); - const char *host = pd->host.unsafeBuf(); + const char *host = pd->host.termedBuf(); storeAppendPrintf(e, "\npeer digest from %s\n", host); cacheDigestGuessStatsReport(&pd->stats.guess, e, host); diff --git a/src/store.cc b/src/store.cc index 5351cbafac..5d0baa815f 100644 --- a/src/store.cc +++ b/src/store.cc @@ -696,9 +696,9 @@ StoreEntry::setPublicKey() #if X_ACCELERATOR_VARY vary = mem_obj->getReply()->header.getList(HDR_X_ACCELERATOR_VARY); - if (vary.unsafeBuf()) { + if (vary.defined()) { /* Again, we own this structure layout */ - rep->header.putStr(HDR_X_ACCELERATOR_VARY, vary.unsafeBuf()); + rep->header.putStr(HDR_X_ACCELERATOR_VARY, vary.termedBuf()); vary.clean(); }