Remove ugly curl struct pointer from jsonFetchValue signature

src/convert_json.cpp

@@ -32,20 +32,16 @@ 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) {
+		std::vector<std::string> *extra_headers) {
 
 	HTTPFetchRequest fetchrequest;
 	HTTPFetchResult fetchresult;
 	fetchrequest.url = url;
 	fetchrequest.caller = HTTPFETCH_SYNC;
 
-#if USE_CURL
+	if (extra_headers != NULL)
-	struct curl_slist* runptr = chunk;
+		fetchrequest.extra_headers = *extra_headers;
-	while(runptr) {
+
-		fetchrequest.extra_headers.push_back(runptr->data);
-		runptr = runptr->next;
-	}
-#endif
 	httpfetch_sync(fetchrequest,fetchresult);
 
 	if (!fetchresult.succeeded) {

src/convert_json.h

@@ -29,6 +29,6 @@ std::vector<ModStoreMod>    readModStoreList(Json::Value& modlist);
 ModStoreModDetails          readModStoreModDetails(Json::Value& details);
 
 Json::Value                 fetchJsonValue(const std::string &url,
-                                           struct curl_slist *chunk);
+                                           std::vector<std::string> *extra_headers);
 
 #endif

src/guiEngine.cpp

@@ -36,10 +36,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUIStaticText.h>
 #include <ICameraSceneNode.h>
 
-#if USE_CURL
-#include <curl/curl.h>
-#endif
-
 /******************************************************************************/
 /** TextDestGuiEngine                                                         */
 /******************************************************************************/

src/mods.cpp

@@ -335,7 +335,7 @@ void ModConfiguration::resolveDependencies()
 #if USE_CURL
 Json::Value getModstoreUrl(std::string url)
 {
-	struct curl_slist *chunk = NULL;
+	std::vector<std::string> extra_headers;
 
 	bool special_http_header = true;
 
@@ -345,15 +345,13 @@ Json::Value getModstoreUrl(std::string url)
 	catch(SettingNotFoundException &e) {
 	}
 
-	if (special_http_header)
+	if (special_http_header) {
-		chunk = curl_slist_append(chunk, "Accept: application/vnd.minetest.mmdb-v1+json");
+		extra_headers.push_back("Accept: application/vnd.minetest.mmdb-v1+json");
-
+		return fetchJsonValue(url, &extra_headers);
-	Json::Value retval = fetchJsonValue(url,chunk);
+	}
-
+	else {
-	if (chunk != NULL)
+		return fetchJsonValue(url, NULL);
-		curl_slist_free_all(chunk);
+	}
-
-	return retval;
 }
 
 #endif

src/mods.h

@@ -30,10 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "json/json.h"
 #include "config.h"
 
-#if USE_CURL
-#include <curl/curl.h>
-#endif
-
 #define MODNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_"
 
 class ModError : public std::exception

src/serverlist.cpp

@@ -70,7 +70,7 @@ std::vector<ServerListSpec> getLocal()
 
 std::vector<ServerListSpec> getOnline()
 {
-	Json::Value root = fetchJsonValue((g_settings->get("serverlist_url")+"/list").c_str(),0);
+	Json::Value root = fetchJsonValue((g_settings->get("serverlist_url")+"/list").c_str(), NULL);
 
 	std::vector<ServerListSpec> serverlist;