From 350e2aeca88de2de7eadc3a19c1fbdf0046f2e55 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Wed, 18 Nov 2009 09:54:02 +0100 Subject: [PATCH] Fixed some cases of variable shadowing Fixed shadowing-related bug in http reply handling --- src/BodyPipe.cc | 44 +++++++++---------- src/ConfigOption.cc | 4 +- src/DiskIO/AIO/AIODiskIOStrategy.cc | 4 +- src/DiskIO/DiskDaemon/DiskdIOStrategy.cc | 8 ++-- .../DiskThreads/DiskThreadsIOStrategy.cc | 4 +- src/HttpReply.cc | 8 ++-- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc index 501f17b52b..eb0a7e52d4 100644 --- a/src/BodyPipe.cc +++ b/src/BodyPipe.cc @@ -200,14 +200,14 @@ BodyPipe::clearProducer(bool atEof) } size_t -BodyPipe::putMoreData(const char *buf, size_t size) +BodyPipe::putMoreData(const char *aBuffer, size_t size) { if (bodySizeKnown()) size = min((uint64_t)size, unproducedSize()); const size_t spaceSize = static_cast(theBuf.potentialSpaceSize()); if ((size = min(size, spaceSize))) { - theBuf.append(buf, size); + theBuf.append(aBuffer, size); postAppend(size); return size; } @@ -261,15 +261,15 @@ BodyPipe::clearConsumer() } size_t -BodyPipe::getMoreData(MemBuf &buf) +BodyPipe::getMoreData(MemBuf &aMemBuffer) { if (!theBuf.hasContent()) return 0; // did not touch the possibly uninitialized buf - if (buf.isNull()) - buf.init(); - const size_t size = min(theBuf.contentSize(), buf.potentialSpaceSize()); - buf.append(theBuf.content(), size); + if (aMemBuffer.isNull()) + aMemBuffer.init(); + const size_t size = min(theBuf.contentSize(), aMemBuffer.potentialSpaceSize()); + aMemBuffer.append(theBuf.content(), size); theBuf.consume(size); postConsume(size); return size; // cannot be zero if we called buf.init above @@ -409,35 +409,35 @@ BodyPipe::scheduleBodyEndNotification() // a short temporary string describing buffer status for debugging const char *BodyPipe::status() const { - static MemBuf buf; - buf.reset(); + static MemBuf outputBuffer; + outputBuffer.reset(); - buf.append(" [", 2); + outputBuffer.append(" [", 2); - buf.Printf("%"PRIu64"<=%"PRIu64, theGetSize, thePutSize); + outputBuffer.Printf("%"PRIu64"<=%"PRIu64, theGetSize, thePutSize); if (theBodySize >= 0) - buf.Printf("<=%"PRId64, theBodySize); + outputBuffer.Printf("<=%"PRId64, theBodySize); else - buf.append("<=?", 3); + outputBuffer.append("<=?", 3); - buf.Printf(" %d+%d", (int)theBuf.contentSize(), (int)theBuf.spaceSize()); + outputBuffer.Printf(" %d+%d", (int)theBuf.contentSize(), (int)theBuf.spaceSize()); - buf.Printf(" pipe%p", this); + outputBuffer.Printf(" pipe%p", this); if (theProducer) - buf.Printf(" prod%p", theProducer); + outputBuffer.Printf(" prod%p", theProducer); if (theConsumer) - buf.Printf(" cons%p", theConsumer); + outputBuffer.Printf(" cons%p", theConsumer); if (mustAutoConsume) - buf.append(" A", 2); + outputBuffer.append(" A", 2); if (isCheckedOut) - buf.append(" L", 2); // Locked + outputBuffer.append(" L", 2); // Locked - buf.append("]", 1); + outputBuffer.append("]", 1); - buf.terminate(); + outputBuffer.terminate(); - return buf.content(); + return outputBuffer.content(); } diff --git a/src/ConfigOption.cc b/src/ConfigOption.cc index de3ee2ea14..00cb31d264 100644 --- a/src/ConfigOption.cc +++ b/src/ConfigOption.cc @@ -45,12 +45,12 @@ ConfigOptionVector::~ConfigOptionVector() } bool -ConfigOptionVector::parse(char const *option, const char *value, int reconfiguring) +ConfigOptionVector::parse(char const *option, const char *value, int isaReconfig) { Vector::iterator i = options.begin(); while (i != options.end()) { - if ((*i)->parse(option,value, reconfiguring)) + if ((*i)->parse(option,value, isaReconfig)) return true; ++i; diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.cc b/src/DiskIO/AIO/AIODiskIOStrategy.cc index 291d2f07ba..61f79921ad 100644 --- a/src/DiskIO/AIO/AIODiskIOStrategy.cc +++ b/src/DiskIO/AIO/AIODiskIOStrategy.cc @@ -123,7 +123,7 @@ AIODiskIOStrategy::callback() void *cbdata; int callback_valid; void *buf; - int fd; + int filedescriptor; async_queue_entry_t *aqe; async_queue_entry_type_t type; @@ -148,7 +148,7 @@ AIODiskIOStrategy::callback() /* Get the callback parameters */ freefunc = aqe->aq_e_free; buf = aqe->aq_e_buf; - fd = aqe->aq_e_fd; + filedescriptor = aqe->aq_e_fd; type = aqe->aq_e_type; callback_valid = cbdataReferenceValidDone(aqe->aq_e_callback_data, &cbdata); AIODiskFile * theFile = NULL; diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc index ac09014551..54ba1a04d0 100644 --- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc +++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc @@ -439,7 +439,7 @@ DiskdIOStrategy::getOptionTree() const } bool -DiskdIOStrategy::optionQ1Parse(const char *name, const char *value, int reconfiguring) +DiskdIOStrategy::optionQ1Parse(const char *name, const char *value, int isaReconfig) { if (strcmp(name, "Q1") != 0) return false; @@ -448,7 +448,7 @@ DiskdIOStrategy::optionQ1Parse(const char *name, const char *value, int reconfig magic1 = atoi(value); - if (!reconfiguring) + if (!isaReconfig) return true; if (old_magic1 < magic1) { @@ -478,7 +478,7 @@ DiskdIOStrategy::optionQ1Dump(StoreEntry * e) const } bool -DiskdIOStrategy::optionQ2Parse(const char *name, const char *value, int reconfiguring) +DiskdIOStrategy::optionQ2Parse(const char *name, const char *value, int isaReconfig) { if (strcmp(name, "Q2") != 0) return false; @@ -487,7 +487,7 @@ DiskdIOStrategy::optionQ2Parse(const char *name, const char *value, int reconfig magic2 = atoi(value); - if (!reconfiguring) + if (!isaReconfig) return true; if (old_magic2 < magic2) { diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc index 9ae67dcd89..8b507c183e 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc @@ -139,13 +139,13 @@ DiskThreadsIOStrategy::callback() dlinkDelete(&ctrlp->node, &used_list); if (ctrlp->done_handler) { - AIOCB *callback = ctrlp->done_handler; + AIOCB *done_callback = ctrlp->done_handler; void *cbdata; ctrlp->done_handler = NULL; if (cbdataReferenceValidDone(ctrlp->done_handler_data, &cbdata)) { retval = 1; /* Return that we've actually done some work */ - callback(ctrlp->fd, cbdata, ctrlp->bufp, + done_callback(ctrlp->fd, cbdata, ctrlp->bufp, ctrlp->result.aio_return, ctrlp->result.aio_errno); } else { if (ctrlp->operation == _AIO_OPEN) { diff --git a/src/HttpReply.cc b/src/HttpReply.cc index 72b29313d3..50af61ba54 100644 --- a/src/HttpReply.cc +++ b/src/HttpReply.cc @@ -210,7 +210,7 @@ HttpReply::packed304Reply() void HttpReply::setHeaders(HttpVersion ver, http_status status, const char *reason, - const char *ctype, int64_t clen, time_t lmt, time_t expires) + const char *ctype, int64_t clen, time_t lmt, time_t expiresTime) { HttpHeader *hdr; httpStatusLineSet(&sline, ver, status, reason); @@ -228,8 +228,8 @@ HttpReply::setHeaders(HttpVersion ver, http_status status, const char *reason, if (clen >= 0) hdr->putInt64(HDR_CONTENT_LENGTH, clen); - if (expires >= 0) - hdr->putTime(HDR_EXPIRES, expires); + if (expiresTime >= 0) + hdr->putTime(HDR_EXPIRES, expiresTime); if (lmt > 0) /* this used to be lmt != 0 @?@ */ hdr->putTime(HDR_LAST_MODIFIED, lmt); @@ -238,7 +238,7 @@ HttpReply::setHeaders(HttpVersion ver, http_status status, const char *reason, content_length = clen; - expires = expires; + expires = expiresTime; last_modified = lmt; } -- 2.47.2