Skip to content

Commit da34a2b

Browse files
kwolekrkwolekr
committedMay 19, 2015
Replace instances of std::map<std::string, std::string> with StringMap
Also, clean up surrounding code style Replace by-value parameter passing with const refs when possible Fix post-increment of iterators
·
5.11.00.4.13
1 parent 603297c commit da34a2b

25 files changed

+180
-193
lines changed
 

‎src/ban.cpp

+20-29
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void BanManager::load()
5656
infostream<<"BanManager: failed loading from "<<m_banfilepath<<std::endl;
5757
throw SerializationError("BanManager::load(): Couldn't open file");
5858
}
59-
59+
6060
while(!is.eof() && is.good())
6161
{
6262
std::string line;
@@ -74,18 +74,14 @@ void BanManager::load()
7474
void BanManager::save()
7575
{
7676
JMutexAutoLock lock(m_mutex);
77-
infostream<<"BanManager: saving to "<<m_banfilepath<<std::endl;
77+
infostream << "BanManager: saving to " << m_banfilepath << std::endl;
7878
std::ostringstream ss(std::ios_base::binary);
7979

80-
for(std::map<std::string, std::string>::iterator
81-
i = m_ips.begin();
82-
i != m_ips.end(); i++)
83-
{
84-
ss << i->first << "|" << i->second << "\n";
85-
}
80+
for (StringMap::iterator it = m_ips.begin(); it != m_ips.end(); ++it)
81+
ss << it->first << "|" << it->second << "\n";
8682

87-
if(!fs::safeWriteToFile(m_banfilepath, ss.str())) {
88-
infostream<<"BanManager: failed saving to "<<m_banfilepath<<std::endl;
83+
if (!fs::safeWriteToFile(m_banfilepath, ss.str())) {
84+
infostream << "BanManager: failed saving to " << m_banfilepath << std::endl;
8985
throw SerializationError("BanManager::save(): Couldn't write file");
9086
}
9187

@@ -102,25 +98,23 @@ std::string BanManager::getBanDescription(const std::string &ip_or_name)
10298
{
10399
JMutexAutoLock lock(m_mutex);
104100
std::string s = "";
105-
for(std::map<std::string, std::string>::iterator
106-
i = m_ips.begin();
107-
i != m_ips.end(); i++)
108-
{
109-
if(i->first == ip_or_name || i->second == ip_or_name
110-
|| ip_or_name == "")
111-
s += i->first + "|" + i->second + ", ";
101+
for (StringMap::iterator it = m_ips.begin(); it != m_ips.end(); ++it) {
102+
if (it->first == ip_or_name || it->second == ip_or_name
103+
|| ip_or_name == "") {
104+
s += it->first + "|" + it->second + ", ";
105+
}
112106
}
113-
s = s.substr(0, s.size()-2);
107+
s = s.substr(0, s.size() - 2);
114108
return s;
115109
}
116110

117111
std::string BanManager::getBanName(const std::string &ip)
118112
{
119113
JMutexAutoLock lock(m_mutex);
120-
std::map<std::string, std::string>::iterator i = m_ips.find(ip);
121-
if(i == m_ips.end())
114+
StringMap::iterator it = m_ips.find(ip);
115+
if (it == m_ips.end())
122116
return "";
123-
return i->second;
117+
return it->second;
124118
}
125119

126120
void BanManager::add(const std::string &ip, const std::string &name)
@@ -133,19 +127,16 @@ void BanManager::add(const std::string &ip, const std::string &name)
133127
void BanManager::remove(const std::string &ip_or_name)
134128
{
135129
JMutexAutoLock lock(m_mutex);
136-
for(std::map<std::string, std::string>::iterator
137-
i = m_ips.begin();
138-
i != m_ips.end();)
139-
{
140-
if((i->first == ip_or_name) || (i->second == ip_or_name)) {
141-
m_ips.erase(i++);
130+
for (StringMap::iterator it = m_ips.begin(); it != m_ips.end();) {
131+
if ((it->first == ip_or_name) || (it->second == ip_or_name)) {
132+
m_ips.erase(it++);
142133
} else {
143-
++i;
134+
++it;
144135
}
145136
}
146137
m_modified = true;
147138
}
148-
139+
149140

150141
bool BanManager::isModified()
151142
{

‎src/ban.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2020
#ifndef BAN_HEADER
2121
#define BAN_HEADER
2222

23-
#include <map>
24-
#include <string>
23+
#include "util/string.h"
2524
#include "jthread/jthread.h"
2625
#include "jthread/jmutex.h"
2726
#include "exceptions.h"
@@ -43,7 +42,7 @@ class BanManager
4342
private:
4443
JMutex m_mutex;
4544
std::string m_banfilepath;
46-
std::map<std::string, std::string> m_ips;
45+
StringMap m_ips;
4746
bool m_modified;
4847

4948
};

‎src/client.cpp

+15-16
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ void Client::sendRemovedSounds(std::vector<s32> &soundList)
11021102
}
11031103

11041104
void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
1105-
const std::map<std::string, std::string> &fields)
1105+
const StringMap &fields)
11061106
{
11071107
size_t fields_size = fields.size();
11081108

@@ -1112,10 +1112,10 @@ void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
11121112

11131113
pkt << p << formname << (u16) (fields_size & 0xFFFF);
11141114

1115-
for(std::map<std::string, std::string>::const_iterator
1116-
i = fields.begin(); i != fields.end(); i++) {
1117-
const std::string &name = i->first;
1118-
const std::string &value = i->second;
1115+
StringMap::const_iterator it;
1116+
for (it = fields.begin(); it != fields.end(); ++it) {
1117+
const std::string &name = it->first;
1118+
const std::string &value = it->second;
11191119
pkt << name;
11201120
pkt.putLongString(value);
11211121
}
@@ -1124,18 +1124,18 @@ void Client::sendNodemetaFields(v3s16 p, const std::string &formname,
11241124
}
11251125

11261126
void Client::sendInventoryFields(const std::string &formname,
1127-
const std::map<std::string, std::string> &fields)
1127+
const StringMap &fields)
11281128
{
11291129
size_t fields_size = fields.size();
11301130
FATAL_ERROR_IF(fields_size > 0xFFFF, "Unsupported number of inventory fields");
11311131

11321132
NetworkPacket pkt(TOSERVER_INVENTORY_FIELDS, 0);
11331133
pkt << formname << (u16) (fields_size & 0xFFFF);
11341134

1135-
for(std::map<std::string, std::string>::const_iterator
1136-
i = fields.begin(); i != fields.end(); i++) {
1137-
const std::string &name = i->first;
1138-
const std::string &value = i->second;
1135+
StringMap::const_iterator it;
1136+
for (it = fields.begin(); it != fields.end(); ++it) {
1137+
const std::string &name = it->first;
1138+
const std::string &value = it->second;
11391139
pkt << name;
11401140
pkt.putLongString(value);
11411141
}
@@ -1918,14 +1918,13 @@ ParticleManager* Client::getParticleManager()
19181918

19191919
scene::IAnimatedMesh* Client::getMesh(const std::string &filename)
19201920
{
1921-
std::map<std::string, std::string>::const_iterator i =
1922-
m_mesh_data.find(filename);
1923-
if(i == m_mesh_data.end()){
1924-
errorstream<<"Client::getMesh(): Mesh not found: \""<<filename<<"\""
1925-
<<std::endl;
1921+
StringMap::const_iterator it = m_mesh_data.find(filename);
1922+
if (it == m_mesh_data.end()) {
1923+
errorstream << "Client::getMesh(): Mesh not found: \"" << filename
1924+
<< "\"" << std::endl;
19261925
return NULL;
19271926
}
1928-
const std::string &data = i->second;
1927+
const std::string &data = it->second;
19291928
scene::ISceneManager *smgr = m_device->getSceneManager();
19301929

19311930
// Create the mesh, remove it from cache and return it

‎src/client.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -405,13 +405,13 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
405405
void interact(u8 action, const PointedThing& pointed);
406406

407407
void sendNodemetaFields(v3s16 p, const std::string &formname,
408-
const std::map<std::string, std::string> &fields);
408+
const StringMap &fields);
409409
void sendInventoryFields(const std::string &formname,
410-
const std::map<std::string, std::string> &fields);
410+
const StringMap &fields);
411411
void sendInventoryAction(InventoryAction *a);
412412
void sendChatMessage(const std::wstring &message);
413413
void sendChangePassword(const std::string &oldpassword,
414-
const std::string &newpassword);
414+
const std::string &newpassword);
415415
void sendDamage(u8 damage);
416416
void sendBreath(u16 breath);
417417
void sendRespawn();
@@ -648,7 +648,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
648648
std::map<std::string, Inventory*> m_detached_inventories;
649649

650650
// Storage for mesh data for creating multiple instances of the same mesh
651-
std::map<std::string, std::string> m_mesh_data;
651+
StringMap m_mesh_data;
652652

653653
// own state
654654
LocalClientState m_state;

‎src/content_mapnode.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2323
#include "mapnode.h"
2424
#include "nodedef.h"
2525
#include "nameidmapping.h"
26-
#include <map>
26+
#include "util/string.h"
2727

2828
/*
2929
Legacy node content type IDs
@@ -218,14 +218,13 @@ class NewNameGetter
218218
}
219219
std::string get(const std::string &old)
220220
{
221-
std::map<std::string, std::string>::const_iterator i;
222-
i = old_to_new.find(old);
223-
if(i == old_to_new.end())
221+
StringMap::const_iterator it = old_to_new.find(old);
222+
if (it == old_to_new.end())
224223
return "";
225-
return i->second;
224+
return it->second;
226225
}
227226
private:
228-
std::map<std::string, std::string> old_to_new;
227+
StringMap old_to_new;
229228
};
230229

231230
NewNameGetter newnamegetter;

‎src/game.cpp

+14-12
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ struct TextDestNodeMetadata : public TextDest {
8787
std::string ntext = wide_to_narrow(text);
8888
infostream << "Submitting 'text' field of node at (" << m_p.X << ","
8989
<< m_p.Y << "," << m_p.Z << "): " << ntext << std::endl;
90-
std::map<std::string, std::string> fields;
90+
StringMap fields;
9191
fields["text"] = ntext;
9292
m_client->sendNodemetaFields(m_p, "", fields);
9393
}
94-
void gotText(std::map<std::string, std::string> fields)
94+
void gotText(const StringMap &fields)
9595
{
9696
m_client->sendNodemetaFields(m_p, "", fields);
9797
}
@@ -111,7 +111,7 @@ struct TextDestPlayerInventory : public TextDest {
111111
m_client = client;
112112
m_formname = formname;
113113
}
114-
void gotText(std::map<std::string, std::string> fields)
114+
void gotText(const StringMap &fields)
115115
{
116116
m_client->sendInventoryFields(m_formname, fields);
117117
}
@@ -138,7 +138,7 @@ struct LocalFormspecHandler : public TextDest {
138138
errorstream << "LocalFormspecHandler::gotText old style message received" << std::endl;
139139
}
140140

141-
void gotText(std::map<std::string, std::string> fields)
141+
void gotText(const StringMap &fields)
142142
{
143143
if (m_formname == "MT_PAUSE_MENU") {
144144
if (fields.find("btn_sound") != fields.end()) {
@@ -180,9 +180,9 @@ struct LocalFormspecHandler : public TextDest {
180180

181181
if ((fields.find("btn_send") != fields.end()) ||
182182
(fields.find("quit") != fields.end())) {
183-
if (fields.find("f_text") != fields.end()) {
184-
m_client->typeChatMessage(narrow_to_wide(fields["f_text"]));
185-
}
183+
StringMap::const_iterator it = fields.find("f_text");
184+
if (it != fields.end())
185+
m_client->typeChatMessage(narrow_to_wide(it->second));
186186

187187
return;
188188
}
@@ -210,12 +210,14 @@ struct LocalFormspecHandler : public TextDest {
210210
return;
211211
}
212212

213-
errorstream << "LocalFormspecHandler::gotText unhandled >" << m_formname << "< event" << std::endl;
214-
int i = 0;
213+
errorstream << "LocalFormspecHandler::gotText unhandled >"
214+
<< m_formname << "< event" << std::endl;
215215

216-
for (std::map<std::string, std::string>::iterator iter = fields.begin();
217-
iter != fields.end(); iter++) {
218-
errorstream << "\t" << i << ": " << iter->first << "=" << iter->second << std::endl;
216+
int i = 0;
217+
StringMap::const_iterator it;
218+
for (it = fields.begin(); it != fields.end(); ++it) {
219+
errorstream << "\t" << i << ": " << it->first
220+
<< "=" << it->second << std::endl;
219221
i++;
220222
}
221223
}

‎src/guiEngine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ TextDestGuiEngine::TextDestGuiEngine(GUIEngine* engine)
5353
}
5454

5555
/******************************************************************************/
56-
void TextDestGuiEngine::gotText(std::map<std::string, std::string> fields)
56+
void TextDestGuiEngine::gotText(const StringMap &fields)
5757
{
5858
m_engine->getScriptIface()->handleMainMenuButtons(fields);
5959
}

‎src/guiEngine.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class TextDestGuiEngine : public TextDest
7373
* receive fields transmitted by guiFormSpecMenu
7474
* @param fields map containing formspec field elements currently active
7575
*/
76-
void gotText(std::map<std::string, std::string> fields);
76+
void gotText(const StringMap &fields);
7777

7878
/**
7979
* receive text/events transmitted by guiFormSpecMenu

‎src/guiFileSelectMenu.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void GUIFileSelectMenu::drawMenu()
8484

8585
void GUIFileSelectMenu::acceptInput() {
8686
if ((m_text_dst != 0) && (this->m_formname != "")){
87-
std::map<std::string, std::string> fields;
87+
StringMap fields;
8888

8989
if (m_accepted)
9090
fields[m_formname + "_accepted"] = wide_to_narrow(m_fileOpenDialog->getFileName());

‎src/guiFormSpecMenu.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2579,7 +2579,7 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode=quit_mode_no)
25792579
{
25802580
if(m_text_dst)
25812581
{
2582-
std::map<std::string, std::string> fields;
2582+
StringMap fields;
25832583

25842584
if (quitmode == quit_mode_accept) {
25852585
fields["quit"] = "true";

‎src/guiFormSpecMenu.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct TextDest
5656
virtual ~TextDest() {};
5757
// This is deprecated I guess? -celeron55
5858
virtual void gotText(std::wstring text){}
59-
virtual void gotText(std::map<std::string, std::string> fields) = 0;
59+
virtual void gotText(const StringMap &fields) = 0;
6060
virtual void setFormName(std::string formname)
6161
{ m_formname = formname;};
6262

‎src/httpfetch.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,7 @@ HTTPFetchOngoing::HTTPFetchOngoing(HTTPFetchRequest request_, CurlHandlePool *po
266266
curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
267267
} else if (request.multipart) {
268268
curl_httppost *last = NULL;
269-
for (std::map<std::string, std::string>::iterator it =
270-
request.post_fields.begin();
269+
for (StringMap::iterator it = request.post_fields.begin();
271270
it != request.post_fields.end(); ++it) {
272271
curl_formadd(&post, &last,
273272
CURLFORM_NAMELENGTH, it->first.size(),
@@ -282,10 +281,8 @@ HTTPFetchOngoing::HTTPFetchOngoing(HTTPFetchRequest request_, CurlHandlePool *po
282281
} else if (request.post_data.empty()) {
283282
curl_easy_setopt(curl, CURLOPT_POST, 1);
284283
std::string str;
285-
for (std::map<std::string, std::string>::iterator it =
286-
request.post_fields.begin();
287-
it != request.post_fields.end();
288-
++it) {
284+
for (StringMap::iterator it = request.post_fields.begin();
285+
it != request.post_fields.end(); ++it) {
289286
if (str != "")
290287
str += "&";
291288
str += urlencode(it->first);

‎src/httpfetch.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2020
#ifndef HTTPFETCH_HEADER
2121
#define HTTPFETCH_HEADER
2222

23-
#include <string>
2423
#include <vector>
25-
#include <map>
24+
#include "util/string.h"
2625
#include "config.h"
2726

2827
// Can be used in place of "caller" in asynchronous transfers to discard result
@@ -54,7 +53,7 @@ struct HTTPFetchRequest
5453

5554
// POST fields. Fields are escaped properly.
5655
// If this is empty a GET request is done instead.
57-
std::map<std::string, std::string> post_fields;
56+
StringMap post_fields;
5857

5958
// Raw POST data, overrides post_fields.
6059
std::string post_data;

0 commit comments

Comments
 (0)
Please sign in to comment.