mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-27 16:09:00 +02:00
Code Issues Projects Releases Wiki Activity

- more code cleanup based on suggestions from cppcheck

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-18 08:16:47 +00:00
parent 829a72db35
commit e86cb3aeff
16 changed files with 63 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/shared_lib/sources/util/properties.cpp
View File

@@ -167,11 +167,10 @@ std::map<string,string> Properties::getTagReplacementValues(std::map<string,stri
// #1
// First add the standard tags
//
char *homeDir = NULL;
#ifdef WIN32
homeDir = getenv("USERPROFILE");
char *homeDir = getenv("USERPROFILE");
#else
homeDir = getenv("HOME");
char *homeDir = getenv("HOME");
#endif
mapTagReplacementValues["~/"] = (homeDir != NULL ? homeDir : "");
@@ -204,8 +203,8 @@ std::map<string,string> Properties::getTagReplacementValues(std::map<string,stri
}
#endif
char *username = NULL;
username = getenv("USERNAME");
//char *username = NULL;
char *username = getenv("USERNAME");
mapTagReplacementValues["$USERNAME"] = (username != NULL ? username : "");
mapTagReplacementValues["%%USERNAME%%"] = (username != NULL ? username : "");
@@ -257,11 +256,10 @@ bool Properties::applyTagsToValue(string &value, std::map<string,string> *mapTag
}
}
else {
char *homeDir = NULL;
#ifdef WIN32
homeDir = getenv("USERPROFILE");
char *homeDir = getenv("USERPROFILE");
#else
homeDir = getenv("HOME");
char *homeDir = getenv("HOME");
#endif
replaceAll(value, "~/", (homeDir != NULL ? homeDir : ""));
@@ -293,8 +291,8 @@ bool Properties::applyTagsToValue(string &value, std::map<string,string> *mapTag
}
#endif
char *username = NULL;
username = getenv("USERNAME");
//char *username = NULL;
char *username = getenv("USERNAME");
replaceAll(value, "$USERNAME", (username != NULL ? username : ""));
replaceAll(value, "%%USERNAME%%", (username != NULL ? username : ""));
replaceAll(value, "{USERNAME}", (username != NULL ? username : ""));