mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

controlapi/config: simplify error handling

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e407ef5a98
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-20 (Sat, 20 Feb 2016)

Origin message was:
------------------
- controlapi/config: simplify error handling

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-02-20 23:08:41 +01:00
parent 8f8e91ef11
commit 8f5399d2f4
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -3045,9 +3045,7 @@ void CControlAPI::ConfigCGI(CyhookHandler *hh) {
} }
else { else {
if(!configFileName.empty()) if(!configFileName.empty())
error = string_printf("no config defined for: %s", (hh->ParamList["config"]).c_str()); error = string_printf("no config defined for %s", (hh->ParamList["config"]).c_str());
else
error = "no config given";
} }
// write footer // write footer
@@ -3059,14 +3057,8 @@ void CControlAPI::ConfigCGI(CyhookHandler *hh) {
hh->WriteLn(hh->outCollection("config", result)); hh->WriteLn(hh->outCollection("config", result));
} }
} }
else { else
if (outType == json) { hh->SendError(error);
hh->WriteLn(json_out_error(error));
}
else {
hh->SendError();
}
}
delete Config; delete Config;
} }