The last batch of WHITE SPACE loops.

...okay, enough of this running gag.
This commit is contained in:
Jason Felds
2013-04-27 15:24:55 -04:00
parent 08218a3a85
commit 2a5227afbb
2 changed files with 766 additions and 769 deletions
-3
View File
@@ -11,9 +11,6 @@ for( vector<elemType>::const_iterator var = (vect).begin(); var != (vect).end();
/** @brief General foreach loop iterating over a map. */ /** @brief General foreach loop iterating over a map. */
#define FOREACHM( keyType, valType, vect, var ) \ #define FOREACHM( keyType, valType, vect, var ) \
for( map<keyType, valType>::iterator var = (vect).begin(); var != (vect).end(); ++var ) for( map<keyType, valType>::iterator var = (vect).begin(); var != (vect).end(); ++var )
/** @brief General foreach loop iterating over a map, using a constant iterator. */
#define FOREACHM_CONST( keyType, valType, vect, var ) \
for( map<keyType, valType>::const_iterator var = (vect).begin(); var != (vect).end(); ++var )
#endif #endif
@@ -588,18 +588,18 @@ void NetworkPostData::CreateMimeData( const map<RString,RString> &mapNameToData,
while(1) while(1)
{ {
sMimeBoundaryOut = ssprintf( "--%08i", rand() ); sMimeBoundaryOut = ssprintf( "--%08i", rand() );
FOREACHM_CONST( RString, RString, mapNameToData, d ) for (auto const &d : mapNameToData)
if( d->second.find(sMimeBoundaryOut) != RString::npos ) if( d.second.find(sMimeBoundaryOut) != RString::npos )
continue; continue;
break; break;
} }
FOREACHM_CONST( RString, RString, mapNameToData, d ) for (auto const &d : mapNameToData)
{ {
sOut += "--" + sMimeBoundaryOut + "\r\n"; sOut += "--" + sMimeBoundaryOut + "\r\n";
sOut += ssprintf( "Content-Disposition: form-data; name=\"%s\"\r\n", d->first.c_str() ); sOut += ssprintf( "Content-Disposition: form-data; name=\"%s\"\r\n", d.first.c_str() );
sOut += "\r\n"; sOut += "\r\n";
sOut += d->second; sOut += d.second;
sOut += "\r\n"; sOut += "\r\n";
} }
if( sOut.size() ) if( sOut.size() )