From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Wed, 7 Mar 2012 00:35:22 +0000 (-0700)
Subject: Break out assignment from if clause to make code more readable (and gcc happier)
X-Git-Tag: SQUID_3_2_0_16~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78ceb778e45ad8d330b9f3065cca015c0804aa3e;p=thirdparty%2Fsquid.git

Break out assignment from if clause to make code more readable (and gcc happier)
---

diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc
index 3c6c875260..df0276223f 100644
--- a/src/adaptation/ecap/XactionRep.cc
+++ b/src/adaptation/ecap/XactionRep.cc
@@ -199,8 +199,8 @@ Adaptation::Ecap::XactionRep::visitEachMetaHeader(libecap::NamedValueVisitor &vi
 
     typedef Adaptation::Config::MetaHeaders::iterator ACAMLI;
     for (ACAMLI i = Adaptation::Config::metaHeaders.begin(); i != Adaptation::Config::metaHeaders.end(); ++i) {
-        const char *v;
-        if (v = (*i)->match(request, reply)) {
+        const char *v = (*i)->match(request, reply);
+        if (v) {
             const libecap::Name name((*i)->name.termedBuf());
             const libecap::Area value = libecap::Area::FromTempString(v);
             visitor.visit(name, value);