Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix various points reported by cppcheck (#5656)
* Fix various performance issues reported by cppcheck + code style (CI)

* Make CI happy with code style on master
* guiFileSelectMenu: remove useless includes
* some performance fixes pointed by cppcheck
* remove some useless casts
* TextDest: remove unused setFormSpec function

* Fix various iterator post-increment reported by cppcheck
  • Loading branch information
nerzhul committed Apr 25, 2017
1 parent af96309 commit a7e131f
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 31 deletions.
3 changes: 2 additions & 1 deletion src/game.cpp
Expand Up @@ -202,7 +202,8 @@ class NodeMetadataFormSource: public IFormSource

return meta->getString("formspec");
}
std::string resolveText(std::string str)

virtual std::string resolveText(const std::string &str)
{
NodeMetadata *meta = m_map->getNodeMetadata(m_p);

Expand Down
2 changes: 1 addition & 1 deletion src/guiFormSpecMenu.h
Expand Up @@ -69,7 +69,7 @@ class IFormSource
virtual ~IFormSource(){}
virtual std::string getForm() = 0;
// Fill in variables in field text
virtual std::string resolveText(std::string str){ return str; }
virtual std::string resolveText(const std::string &str) { return str; }
};

class GUIFormSpecMenu : public GUIModalMenu
Expand Down
13 changes: 6 additions & 7 deletions src/map_settings_manager.cpp
Expand Up @@ -25,14 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include "map_settings_manager.h"

MapSettingsManager::MapSettingsManager(
Settings *user_settings, const std::string &map_meta_path)
MapSettingsManager::MapSettingsManager(Settings *user_settings,
const std::string &map_meta_path):
mapgen_params(NULL),
m_map_meta_path(map_meta_path),
m_map_settings(new Settings()),
m_user_settings(user_settings)
{
m_map_meta_path = map_meta_path;
m_user_settings = user_settings;
m_map_settings = new Settings;
mapgen_params = NULL;

assert(m_user_settings != NULL);
}

Expand Down
7 changes: 3 additions & 4 deletions src/nodedef.cpp
Expand Up @@ -1318,22 +1318,21 @@ void CNodeDefManager::removeNode(const std::string &name)

// Erase node content from all groups it belongs to
for (UNORDERED_MAP<std::string, GroupItems>::iterator iter_groups =
m_group_to_items.begin();
iter_groups != m_group_to_items.end();) {
m_group_to_items.begin(); iter_groups != m_group_to_items.end();) {
GroupItems &items = iter_groups->second;
for (GroupItems::iterator iter_groupitems = items.begin();
iter_groupitems != items.end();) {
if (iter_groupitems->first == id)
items.erase(iter_groupitems++);
else
iter_groupitems++;
++iter_groupitems;
}

// Check if group is empty
if (items.size() == 0)
m_group_to_items.erase(iter_groups++);
else
iter_groups++;
++iter_groups;
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/script/cpp_api/s_async.cpp
Expand Up @@ -46,26 +46,26 @@ AsyncEngine::~AsyncEngine()

// Request all threads to stop
for (std::vector<AsyncWorkerThread *>::iterator it = workerThreads.begin();
it != workerThreads.end(); it++) {
it != workerThreads.end(); ++it) {
(*it)->stop();
}


// Wake up all threads
for (std::vector<AsyncWorkerThread *>::iterator it = workerThreads.begin();
it != workerThreads.end(); it++) {
it != workerThreads.end(); ++it) {
jobQueueCounter.post();
}

// Wait for threads to finish
for (std::vector<AsyncWorkerThread *>::iterator it = workerThreads.begin();
it != workerThreads.end(); it++) {
it != workerThreads.end(); ++it) {
(*it)->wait();
}

// Force kill all threads
for (std::vector<AsyncWorkerThread *>::iterator it = workerThreads.begin();
it != workerThreads.end(); it++) {
it != workerThreads.end(); ++it) {
delete *it;
}

Expand Down Expand Up @@ -205,7 +205,7 @@ void AsyncEngine::pushFinishedJobs(lua_State* L) {
void AsyncEngine::prepareEnvironment(lua_State* L, int top)
{
for (UNORDERED_MAP<std::string, lua_CFunction>::iterator it = functionList.begin();
it != functionList.end(); it++) {
it != functionList.end(); ++it) {
lua_pushstring(L, it->first.c_str());
lua_pushcfunction(L, it->second);
lua_settable(L, top);
Expand Down
2 changes: 1 addition & 1 deletion src/script/cpp_api/s_node.cpp
Expand Up @@ -263,7 +263,7 @@ void ScriptApiNode::node_on_receive_fields(v3s16 p,
lua_pushstring(L, formname.c_str()); // formname
lua_newtable(L); // fields
StringMap::const_iterator it;
for (it = fields.begin(); it != fields.end(); it++) {
for (it = fields.begin(); it != fields.end(); ++it) {
const std::string &name = it->first;
const std::string &value = it->second;
lua_pushstring(L, name.c_str());
Expand Down
2 changes: 1 addition & 1 deletion src/script/lua_api/l_client.cpp
Expand Up @@ -83,7 +83,7 @@ int ModApiClient::l_get_player_names(lua_State *L)
int newTable = lua_gettop(L);
int index = 1;
std::list<std::string>::const_iterator iter;
for (iter = plist.begin(); iter != plist.end(); iter++) {
for (iter = plist.begin(); iter != plist.end(); ++iter) {
lua_pushstring(L, (*iter).c_str());
lua_rawseti(L, newTable, index);
index++;
Expand Down
2 changes: 1 addition & 1 deletion src/script/lua_api/l_craft.cpp
Expand Up @@ -414,7 +414,7 @@ static void push_craft_recipe(lua_State *L, IGameDef *gdef,

lua_newtable(L); // items
std::vector<ItemStack>::const_iterator iter = input.items.begin();
for (u16 j = 1; iter != input.items.end(); iter++, j++) {
for (u16 j = 1; iter != input.items.end(); ++iter, j++) {
if (iter->empty())
continue;
lua_pushstring(L, iter->name.c_str());
Expand Down
5 changes: 2 additions & 3 deletions src/script/lua_api/l_env.cpp
Expand Up @@ -534,7 +534,7 @@ int ModApiEnvMod::l_get_objects_inside_radius(lua_State *L)
ScriptApiBase *script = getScriptApiBase(L);
lua_createtable(L, ids.size(), 0);
std::vector<u16>::const_iterator iter = ids.begin();
for(u32 i = 0; iter != ids.end(); iter++) {
for(u32 i = 0; iter != ids.end(); ++iter) {
ServerActiveObject *obj = env->getActiveObject(*iter);
// Insert object reference into table
script->objectrefGetOrCreate(L, obj);
Expand Down Expand Up @@ -985,8 +985,7 @@ int ModApiEnvMod::l_find_path(lua_State *L)
lua_newtable(L);
int top = lua_gettop(L);
unsigned int index = 1;
for (std::vector<v3s16>::iterator i = path.begin(); i != path.end();i++)
{
for (std::vector<v3s16>::iterator i = path.begin(); i != path.end(); ++i) {
lua_pushnumber(L,index);
push_v3s16(L, *i);
lua_settable(L, top);
Expand Down
2 changes: 1 addition & 1 deletion src/script/lua_api/l_mainmenu.cpp
Expand Up @@ -297,7 +297,7 @@ int ModApiMainMenu::l_get_games(lua_State *L)
int table2 = lua_gettop(L);
int internal_index=1;
for (std::set<std::string>::iterator iter = games[i].addon_mods_paths.begin();
iter != games[i].addon_mods_paths.end(); iter++) {
iter != games[i].addon_mods_paths.end(); ++iter) {
lua_pushnumber(L,internal_index);
lua_pushstring(L,(*iter).c_str());
lua_settable(L, table2);
Expand Down
2 changes: 1 addition & 1 deletion src/script/lua_api/l_nodemeta.cpp
Expand Up @@ -107,7 +107,7 @@ void NodeMetaRef::handleToTable(lua_State *L, Metadata *_meta)
if (inv) {
std::vector<const InventoryList *> lists = inv->getLists();
for(std::vector<const InventoryList *>::const_iterator
i = lists.begin(); i != lists.end(); i++) {
i = lists.begin(); i != lists.end(); ++i) {
push_inventory_list(L, inv, (*i)->getName().c_str());
lua_setfield(L, -2, (*i)->getName().c_str());
}
Expand Down
4 changes: 2 additions & 2 deletions src/script/lua_api/l_server.cpp
Expand Up @@ -103,7 +103,7 @@ int ModApiServer::l_get_player_privs(lua_State *L)
int table = lua_gettop(L);
std::set<std::string> privs_s = server->getPlayerEffectivePrivs(name);
for(std::set<std::string>::const_iterator
i = privs_s.begin(); i != privs_s.end(); i++){
i = privs_s.begin(); i != privs_s.end(); ++i){
lua_pushboolean(L, true);
lua_setfield(L, table, i->c_str());
}
Expand Down Expand Up @@ -417,7 +417,7 @@ int ModApiServer::l_get_modnames(lua_State *L)
// Package them up for Lua
lua_createtable(L, modlist.size(), 0);
std::vector<std::string>::iterator iter = modlist.begin();
for (u16 i = 0; iter != modlist.end(); iter++) {
for (u16 i = 0; iter != modlist.end(); ++iter) {
lua_pushstring(L, iter->c_str());
lua_rawseti(L, -2, ++i);
}
Expand Down
6 changes: 3 additions & 3 deletions src/util/thread.h
Expand Up @@ -83,8 +83,8 @@ class GetRequest {
GetRequest() {}
~GetRequest() {}

GetRequest(Key a_key) {
key = a_key;
GetRequest(const Key &a_key): key(a_key)
{
}

Key key;
Expand All @@ -106,7 +106,7 @@ class RequestQueue {
return m_queue.empty();
}

void add(Key key, Caller caller, CallerData callerdata,
void add(const Key &key, Caller caller, CallerData callerdata,
ResultQueue<Key, T, Caller, CallerData> *dest)
{
typename std::deque<GetRequest<Key, T, Caller, CallerData> >::iterator i;
Expand Down

0 comments on commit a7e131f

Please sign in to comment.