github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix json::decodeGetParams when compiled with recent Apple clang

pull/119/head
Nils Maier 2013-08-20 20:45:52 +02:00
parent 270f429838
commit 9da17424c6
1 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/json.cc
View File

@ -101,26 +101,28 @@ decodeGetParams(const std::string& query)
{ {
std::string jsonRequest; std::string jsonRequest;
std::string callback; std::string callback;
if(!query.empty() && query[0] == '?') { if (query.empty() || query[0] != '?') {
Scip method; return JsonGetParam(jsonRequest, callback);
Scip id; }
Scip params;
Scip method = std::make_pair(query.end(), query.end());
Scip id = std::make_pair(query.end(), query.end());
Scip params = std::make_pair(query.end(), query.end());
std::vector<Scip> getParams; std::vector<Scip> getParams;
util::splitIter(query.begin()+1, query.end(), std::back_inserter(getParams), util::splitIter(query.begin()+1, query.end(), std::back_inserter(getParams),
'&'); '&');
for(std::vector<Scip>::const_iterator i = for (const auto& i : getParams) {
getParams.begin(), eoi = getParams.end(); i != eoi; ++i) { if(util::startsWith(i.first, i.second, "method=")) {
if(util::startsWith((*i).first, (*i).second, "method=")) { method.first = i.first+7;
method.first = (*i).first+7; method.second = i.second;
method.second = (*i).second; } else if(util::startsWith(i.first, i.second, "id=")) {
} else if(util::startsWith((*i).first, (*i).second, "id=")) { id.first = i.first+3;
id.first = (*i).first+3; id.second = i.second;
id.second = (*i).second; } else if(util::startsWith(i.first, i.second, "params=")) {
} else if(util::startsWith((*i).first, (*i).second, "params=")) { params.first = i.first+7;
params.first = (*i).first+7; params.second = i.second;
params.second = (*i).second; } else if(util::startsWith(i.first, i.second, "jsoncallback=")) {
} else if(util::startsWith((*i).first, (*i).second, "jsoncallback=")) { callback.assign(i.first+13, i.second);
callback.assign((*i).first+13, (*i).second);
} }
} }
std::string decparam = util::percentDecode(params.first, params.second); std::string decparam = util::percentDecode(params.first, params.second);
@ -146,7 +148,6 @@ decodeGetParams(const std::string& query)
} }
jsonRequest += "}"; jsonRequest += "}";
} }
}
return JsonGetParam(jsonRequest, callback); return JsonGetParam(jsonRequest, callback);
} }