gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move split() to OSUtils since it is not used in core.

Browse Source
This commit is contained in:
Adam Ierymenko
2016-11-18 15:49:28 -08:00
parent 673c0c811e
commit ccdd4ffda7
8 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/ControlPlane.cpp
View File

@@ -266,7 +266,7 @@ unsigned int ControlPlane::handleRequest(
{
char json[8194];
unsigned int scode = 404;
std::vector<std::string> ps(Utils::split(path.c_str(),"/","",""));
std::vector<std::string> ps(OSUtils::split(path.c_str(),"/","",""));
std::map<std::string,std::string> urlArgs;
Mutex::Lock _l(_lock);
@@ -279,7 +279,7 @@ unsigned int ControlPlane::handleRequest(
if (qpos != std::string::npos) {
std::string args(ps[ps.size() - 1].substr(qpos + 1));
ps[ps.size() - 1] = ps[ps.size() - 1].substr(0,qpos);
std::vector<std::string> asplit(Utils::split(args.c_str(),"&","",""));
std::vector<std::string> asplit(OSUtils::split(args.c_str(),"&","",""));
for(std::vector<std::string>::iterator a(asplit.begin());a!=asplit.end();++a) {
std::size_t eqpos = a->find('=');
if (eqpos == std::string::npos)