Don't print an error for valid listring[] formspec

[dragonfireclient.git] / src / porting.cpp

diff --git a/src/porting.cpp b/src/porting.cpp
index 8ea61f7ccf030a46dc0a3fd39aa665acbee2037f..29c82fe24252b3ca11c722f80276568ce7b580cb 100644 (file)
--- a/src/porting.cpp
+++ b/src/porting.cpp
@@ -75,8 +75,7 @@ bool * signal_handler_killstatus(void)
 
 void sigint_handler(int sig)
 {
-       if(g_killed == false)
-       {
+       if(!g_killed) {
                dstream<<DTIME<<"INFO: sigint_handler(): "
                                <<"Ctrl-C pressed, shutting down."<<std::endl;
 
@@ -86,9 +85,7 @@ void sigint_handler(int sig)
                debug_stacks_print();*/
 
                g_killed = true;
-       }
-       else
-       {
+       } else {
                (void)signal(SIGINT, SIG_DFL);
        }
 }
@@ -126,7 +123,7 @@ BOOL WINAPI event_handler(DWORD sig)
 
 void signal_handler_init(void)
 {
-       SetConsoleCtrlHandler( (PHANDLER_ROUTINE)event_handler,TRUE);
+       SetConsoleCtrlHandler((PHANDLER_ROUTINE)event_handler, TRUE);
 }
 
 #endif
@@ -306,14 +303,14 @@ std::string get_sysinfo()
 
        oss << "Windows/" << osvi.dwMajorVersion << "."
                << osvi.dwMinorVersion;
-       if(osvi.szCSDVersion[0])
+       if (osvi.szCSDVersion[0])
                oss << "-" << tmp;
        oss << " ";
        #ifdef _WIN64
        oss << "x86_64";
        #else
        BOOL is64 = FALSE;
-       if(IsWow64Process(GetCurrentProcess(), &is64) && is64)
+       if (IsWow64Process(GetCurrentProcess(), &is64) && is64)
                oss << "x86_64"; // 32-bit app on 64-bit OS
        else
                oss << "x86";
@@ -478,11 +475,11 @@ bool setSystemPaths()
        // Use ".\bin\.."
        path_share = std::string(buf) + "\\..";
 
-       // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME_LOWER>"
+       // Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
        DWORD len = GetEnvironmentVariable("APPDATA", buf, sizeof(buf));
        FATAL_ERROR_IF(len == 0 || len > sizeof(buf), "Failed to get APPDATA");
 
-       path_user = std::string(buf) + DIR_DELIM PROJECT_NAME_LOWER;
+       path_user = std::string(buf) + DIR_DELIM + PROJECT_NAME;
        return true;
 }
 
@@ -514,7 +511,7 @@ bool setSystemPaths()
                trylist.push_back(static_sharedir);
 
        trylist.push_back(bindir + DIR_DELIM ".." DIR_DELIM "share"
-               DIR_DELIM PROJECT_NAME_LOWER);
+               DIR_DELIM + PROJECT_NAME);
        trylist.push_back(bindir + DIR_DELIM "..");
 
 #ifdef __ANDROID__
@@ -543,7 +540,7 @@ bool setSystemPaths()
 
 #ifndef __ANDROID__
        path_user = std::string(getenv("HOME")) + DIR_DELIM "."
-               PROJECT_NAME_LOWER;
+               + PROJECT_NAME;
 #endif
 
        return true;
@@ -566,8 +563,9 @@ bool setSystemPaths()
        }
        CFRelease(resources_url);
 
-       path_user = std::string(getenv("HOME")) +
-               "/Library/Application Support/" PROJECT_NAME_LOWER;
+       path_user = std::string(getenv("HOME"))
+               + "/Library/Application Support/"
+               + PROJECT_NAME;
        return true;
 }
 
@@ -578,7 +576,7 @@ bool setSystemPaths()
 {
        path_share = STATIC_SHAREDIR;
        path_user  = std::string(getenv("HOME")) + DIR_DELIM "."
-               PROJECT_NAME_LOWER;
+               + lowercase(PROJECT_NAME);
        return true;
 }
 
@@ -598,7 +596,7 @@ void initializePaths()
                getExecPathFromProcfs(buf, sizeof(buf));
 
        if (success) {
-               pathRemoveFile(buf, '/');
+               pathRemoveFile(buf, DIR_DELIM_CHAR);
                std::string execpath(buf);
 
                path_share = execpath + DIR_DELIM "..";