From 9a39848ba93eaa56f7f62921f8de7a19e3ed0713 Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 6 Apr 2014 14:02:53 +0200 Subject: Remove a lot of superfluous ifndef USE_CURL checks --- src/convert_json.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/convert_json.cpp') diff --git a/src/convert_json.cpp b/src/convert_json.cpp index 6f227e796..a6107aa64 100644 --- a/src/convert_json.cpp +++ b/src/convert_json.cpp @@ -32,19 +32,20 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "porting.h" Json::Value fetchJsonValue(const std::string &url, - struct curl_slist *chunk) { -#if USE_CURL + struct curl_slist *chunk) { HTTPFetchRequest fetchrequest; HTTPFetchResult fetchresult; fetchrequest.url = url; fetchrequest.caller = HTTPFETCH_SYNC; +#if USE_CURL struct curl_slist* runptr = chunk; while(runptr) { fetchrequest.extra_headers.push_back(runptr->data); runptr = runptr->next; } +#endif httpfetch_sync(fetchrequest,fetchresult); if (!fetchresult.succeeded) { @@ -71,12 +72,12 @@ Json::Value fetchJsonValue(const std::string &url, else { return root; } -#endif + return Json::Value(); } std::vector readModStoreList(Json::Value& modlist) { - std::vector retval; + std::vector retval; if (modlist.isArray()) { for (unsigned int i = 0; i < modlist.size(); i++) -- cgit v1.2.3