From: Automatic source maintenance Date: Tue, 30 Apr 2013 00:13:26 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_3_4_0_1~181 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e6ef752263f1cd590feac3e470af7e1e1d4f211;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/HelperReply.cc b/src/HelperReply.cc index bd36dd8217..433a9e0b69 100644 --- a/src/HelperReply.cc +++ b/src/HelperReply.cc @@ -185,7 +185,7 @@ operator <<(std::ostream &os, const HelperReply &r) // dump the helper key=pair "notes" list if (!r.notes.empty()) { os << ", notes={"; - os << r.notes.toString("; "); + os << r.notes.toString("; "); os << "}"; } diff --git a/src/Notes.cc b/src/Notes.cc index 131cf255ac..56d01c7646 100644 --- a/src/Notes.cc +++ b/src/Notes.cc @@ -150,7 +150,7 @@ NotePairs::find(const char *noteKey) const const char * NotePairs::toString(const char *sep) const { - static String value; + static String value; value.clean(); for (Vector::const_iterator i = entries.begin(); i != entries.end(); ++i) { value.append((*i)->name); @@ -184,7 +184,7 @@ NotePairs::addStrList(const char *key, const char *values) const char *item; const char *pos = NULL; int ilen = 0; - while(strListGetItem(&strValues, ',', &item, &ilen, &pos)) { + while (strListGetItem(&strValues, ',', &item, &ilen, &pos)) { String v; v.append(item, ilen); entries.push_back(new NotePairs::Entry(key, v.termedBuf())); diff --git a/src/Notes.h b/src/Notes.h index 6d9fd3ca9e..860eaaaa59 100644 --- a/src/Notes.h +++ b/src/Notes.h @@ -113,9 +113,10 @@ public: /** * Used to store a note key/value pair. */ - class Entry { + class Entry + { public: - Entry(const char *aKey, const char *aValue): name(aKey), value(aValue) {} + Entry(const char *aKey, const char *aValue): name(aKey), value(aValue) {} String name; String value; MEMPROXY_CLASS(Entry); diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc index 4ffc8b3d67..9863bea590 100644 --- a/src/adaptation/ecap/XactionRep.cc +++ b/src/adaptation/ecap/XactionRep.cc @@ -234,7 +234,7 @@ Adaptation::Ecap::XactionRep::start() if (v) { if (ah->metaHeaders == NULL) ah->metaHeaders = new NotePairs(); - if (!ah->metaHeaders->hasPair((*i)->key.termedBuf(), v)) + if (!ah->metaHeaders->hasPair((*i)->key.termedBuf(), v)) ah->metaHeaders->add((*i)->key.termedBuf(), v); } }