Skip to content
Permalink
Browse files

Remove ugly curl struct pointer from jsonFetchValue signature

  • Loading branch information...
sapier sapier
sapier authored and sapier committed Jun 19, 2014
1 parent 9a39848 commit 8af44f81637938db7e4651d2ef8a294cf43b1072
Showing with 25 additions and 39 deletions.
  1. +4 −8 src/convert_json.cpp
  2. +1 −1 src/convert_json.h
  3. +1 −5 src/guiEngine.cpp
  4. +17 −19 src/mods.cpp
  5. +1 −5 src/mods.h
  6. +1 −1 src/serverlist.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
struct curl_slist* runptr = chunk;
while(runptr) {
fetchrequest.extra_headers.push_back(runptr->data);
runptr = runptr->next;
}
#endif
if (extra_headers != NULL)
fetchrequest.extra_headers = *extra_headers;

httpfetch_sync(fetchrequest,fetchresult);

if (!fetchresult.succeeded) {
@@ -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
@@ -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 */
/******************************************************************************/
@@ -297,7 +293,7 @@ GUIEngine::~GUIEngine()
}

delete m_texture_source;

if (m_cloud.clouds)
m_cloud.clouds->drop();
}
@@ -113,11 +113,11 @@ std::map<std::string, ModSpec> flattenModTree(std::map<std::string, ModSpec> mod
ModSpec mod = (*it).second;
if(mod.is_modpack)
{
std::map<std::string, ModSpec> content =
std::map<std::string, ModSpec> content =
flattenModTree(mod.modpack_content);
result.insert(content.begin(),content.end());
result.insert(std::make_pair(mod.name,mod));
}
}
else //not a modpack
{
result.insert(std::make_pair(mod.name,mod));
@@ -138,8 +138,8 @@ std::vector<ModSpec> flattenMods(std::map<std::string, ModSpec> mods)
std::vector<ModSpec> content = flattenMods(mod.modpack_content);
result.reserve(result.size() + content.size());
result.insert(result.end(),content.begin(),content.end());
}

}
else //not a modpack
{
result.push_back(mod);
@@ -163,10 +163,10 @@ ModConfiguration::ModConfiguration(std::string worldpath)
worldmt_settings.readConfigFile(worldmt.c_str());
std::vector<std::string> names = worldmt_settings.getNames();
std::set<std::string> include_mod_names;
for(std::vector<std::string>::iterator it = names.begin();
for(std::vector<std::string>::iterator it = names.begin();
it != names.end(); ++it)
{
std::string name = *it;
{
std::string name = *it;
// for backwards compatibility: exclude only mods which are
// explicitely excluded. if mod is not mentioned at all, it is
// enabled. So by default, all installed mods are enabled.
@@ -234,7 +234,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods)
// Add all the mods that come from modpacks
// Second iteration:
// Add all the mods that didn't come from modpacks

std::set<std::string> seen_this_iteration;

for(std::vector<ModSpec>::const_iterator it = new_mods.begin();
@@ -325,7 +325,7 @@ void ModConfiguration::resolveDependencies()
else{
++it;
}
}
}
}

// Step 4: write back list of unsatisfied mods
@@ -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)
chunk = curl_slist_append(chunk, "Accept: application/vnd.minetest.mmdb-v1+json");

Json::Value retval = fetchJsonValue(url,chunk);

if (chunk != NULL)
curl_slist_free_all(chunk);

return retval;
if (special_http_header) {
extra_headers.push_back("Accept: application/vnd.minetest.mmdb-v1+json");
return fetchJsonValue(url, &extra_headers);
}
else {
return fetchJsonValue(url, NULL);
}
}

#endif
@@ -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
@@ -104,7 +100,7 @@ class ModConfiguration
m_name_conflicts()
{}


ModConfiguration(std::string worldpath);

// checks if all dependencies are fullfilled.
@@ -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;

0 comments on commit 8af44f8

Please sign in to comment.
You can’t perform that action at this time.