The last batch of WHITE SPACE loops.
...okay, enough of this running gag.
This commit is contained in:
@@ -11,9 +11,6 @@ for( vector<elemType>::const_iterator var = (vect).begin(); var != (vect).end();
|
||||
/** @brief General foreach loop iterating over a map. */
|
||||
#define FOREACHM( keyType, valType, vect, 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
|
||||
|
||||
|
||||
@@ -588,18 +588,18 @@ void NetworkPostData::CreateMimeData( const map<RString,RString> &mapNameToData,
|
||||
while(1)
|
||||
{
|
||||
sMimeBoundaryOut = ssprintf( "--%08i", rand() );
|
||||
FOREACHM_CONST( RString, RString, mapNameToData, d )
|
||||
if( d->second.find(sMimeBoundaryOut) != RString::npos )
|
||||
for (auto const &d : mapNameToData)
|
||||
if( d.second.find(sMimeBoundaryOut) != RString::npos )
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
|
||||
FOREACHM_CONST( RString, RString, mapNameToData, d )
|
||||
for (auto const &d : mapNameToData)
|
||||
{
|
||||
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 += d->second;
|
||||
sOut += d.second;
|
||||
sOut += "\r\n";
|
||||
}
|
||||
if( sOut.size() )
|
||||
|
||||
Reference in New Issue
Block a user