summaryrefslogtreecommitdiff
path: root/src/content
diff options
context:
space:
mode:
authorSmallJoker <SmallJoker@users.noreply.github.com>2020-10-05 09:07:33 +0200
committerGitHub <noreply@github.com>2020-10-05 09:07:33 +0200
commitf46509d5e2c681b6da2abdeb27779be3c36a6916 (patch)
treedf654ae11cb73825e071e8222f37a73a1a604707 /src/content
parent81c66d6efb9fb0ab8a03b40e2bc22aa49eff9a04 (diff)
downloadminetest-f46509d5e2c681b6da2abdeb27779be3c36a6916.tar.gz
minetest-f46509d5e2c681b6da2abdeb27779be3c36a6916.tar.bz2
minetest-f46509d5e2c681b6da2abdeb27779be3c36a6916.zip
Remove unused functions reported by cppcheck (#10463)
Run unused functions reported by cppcheck This change removes a few (but not all) unused functions. Some unused helper functions were not removed due to their complexity and potential of future use.
Diffstat (limited to 'src/content')
-rw-r--r--src/content/CMakeLists.txt1
-rw-r--r--src/content/packages.cpp69
-rw-r--r--src/content/packages.h52
3 files changed, 0 insertions, 122 deletions
diff --git a/src/content/CMakeLists.txt b/src/content/CMakeLists.txt
index 5adcf6b1e..6dd049418 100644
--- a/src/content/CMakeLists.txt
+++ b/src/content/CMakeLists.txt
@@ -1,6 +1,5 @@
set(content_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/content.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/packages.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp
${CMAKE_CURRENT_SOURCE_DIR}/subgames.cpp
PARENT_SCOPE
diff --git a/src/content/packages.cpp b/src/content/packages.cpp
deleted file mode 100644
index 2d488eb76..000000000
--- a/src/content/packages.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Minetest
-Copyright (C) 2018 rubenwardy <rw@rubenwardy.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "content/packages.h"
-#include "log.h"
-#include "filesys.h"
-#include "porting.h"
-#include "settings.h"
-#include "content/mods.h"
-#include "content/subgames.h"
-
-std::string Package::getDownloadURL(const std::string &baseURL) const
-{
- return baseURL + "/packages/" + author + "/" + name + "/releases/" +
- std::to_string(release) + "/download/";
-}
-
-#if USE_CURL
-std::vector<Package> getPackagesFromURL(const std::string &url)
-{
- std::vector<std::string> extra_headers;
- extra_headers.emplace_back("Accept: application/json");
-
- Json::Value json = fetchJsonValue(url, &extra_headers);
- if (!json.isArray()) {
- errorstream << "Invalid JSON download " << std::endl;
- return std::vector<Package>();
- }
-
- std::vector<Package> packages;
-
- // Note: `unsigned int` is required to index JSON
- for (unsigned int i = 0; i < json.size(); ++i) {
- Package package;
-
- package.author = json[i]["author"].asString();
- package.name = json[i]["name"].asString();
- package.title = json[i]["title"].asString();
- package.type = json[i]["type"].asString();
- package.shortDesc = json[i]["shortDesc"].asString();
- package.release = json[i]["release"].asInt();
- if (json[i].isMember("thumbnail"))
- package.thumbnail = json[i]["thumbnail"].asString();
-
- if (package.valid())
- packages.push_back(package);
- else
- errorstream << "Invalid package at " << i << std::endl;
- }
-
- return packages;
-}
-#endif
diff --git a/src/content/packages.h b/src/content/packages.h
deleted file mode 100644
index 9029475ef..000000000
--- a/src/content/packages.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Minetest
-Copyright (C) 2018 rubenwardy <rw@rubenwardy.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#pragma once
-#include "config.h"
-#include "convert_json.h"
-#include "irrlichttypes.h"
-
-struct Package
-{
- std::string author;
- std::string name; // Technical name
- std::string title;
- std::string type; // One of "mod", "game", or "txp"
-
- std::string shortDesc;
- u32 release;
- std::string thumbnail;
-
- bool valid() const
- {
- return !(author.empty() || name.empty() || title.empty() ||
- type.empty() || release <= 0);
- }
-
- std::string getDownloadURL(const std::string &baseURL) const;
-};
-
-#if USE_CURL
-std::vector<Package> getPackagesFromURL(const std::string &url);
-#else
-inline std::vector<Package> getPackagesFromURL(const std::string &url)
-{
- return std::vector<Package>();
-}
-#endif