From a62ecc5bf1e92e6dd2ba8e6e61a797641c254d92 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Wed, 24 Sep 2014 19:51:51 +0200
Subject: - several style fixes suggested by static analysis - will now support
 up to 4 levels of version numbers (major.minor.subminor.subsubminor

---
 src/shared/skyriminfo.cpp | 53 +++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'src/shared/skyriminfo.cpp')

diff --git a/src/shared/skyriminfo.cpp b/src/shared/skyriminfo.cpp
index 72452255..fc1401d8 100644
--- a/src/shared/skyriminfo.cpp
+++ b/src/shared/skyriminfo.cpp
@@ -63,15 +63,17 @@ std::wstring SkyrimInfo::getRegPathStatic()
                                   0, KEY_QUERY_VALUE, &key);
 
   if (errorcode != ERROR_SUCCESS) {
-    return L"";
+    return std::wstring();
   }
 
   WCHAR temp[MAX_PATH];
   DWORD bufferSize = MAX_PATH;
 
-  errorcode = ::RegQueryValueExW(key, L"Installed Path", NULL, NULL, (LPBYTE)temp, &bufferSize);
-
-  return std::wstring(temp);
+  if (::RegQueryValueExW(key, L"Installed Path", NULL, NULL, (LPBYTE)temp, &bufferSize) == ERROR_SUCCESS) {
+    return std::wstring(temp);
+  } else {
+    return std::wstring();
+  }
 }
 
 
@@ -222,7 +224,7 @@ int SkyrimInfo::getNexusModIDStatic()
 void SkyrimInfo::createProfile(const std::wstring &directory, bool useDefaults)
 {
   { // copy plugins.txt
-    std::wstring target = directory.substr().append(L"\\plugins.txt");
+    std::wstring target = directory + L"\\plugins.txt";
     if (!FileExists(target)) {
       std::wostringstream source;
       source << getLocalAppFolder() << "\\Skyrim\\plugins.txt";
@@ -231,11 +233,10 @@ void SkyrimInfo::createProfile(const std::wstring &directory, bool useDefaults)
         ::CloseHandle(file);
       }
     }
-    target = directory.substr().append(L"\\loadorder.txt");
+    target = directory + L"\\loadorder.txt";
     if (!FileExists(target)) {
-      std::wostringstream source;
-      source << getLocalAppFolder() << "\\Skyrim\\loadorder.txt";
-      if (!::CopyFileW(source.str().c_str(), target.c_str(), true)) {
+      std::wstring source = getLocalAppFolder() + L"\\Skyrim\\loadorder.txt";
+      if (!::CopyFileW(source.c_str(), target.c_str(), true)) {
         HANDLE file = ::CreateFileW(target.c_str(), GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
         ::CloseHandle(file);
       }
@@ -243,42 +244,36 @@ void SkyrimInfo::createProfile(const std::wstring &directory, bool useDefaults)
   }
 
   { // copy skyrim.ini-file
-    std::wstring target = directory.substr().append(L"\\skyrim.ini");
+    std::wstring target = directory + L"\\skyrim.ini";
     if (!FileExists(target)) {
-      std::wostringstream source;
+      std::wstring source;
       if (useDefaults) {
-        source << getGameDirectory() << L"\\skyrim_default.ini";
+        source = getGameDirectory() + L"\\skyrim_default.ini";
       } else {
-        source << getMyGamesDirectory() << L"\\Skyrim";
-        if (FileExists(source.str(), L"skyrim.ini")) {
-          source << L"\\skyrim.ini";
+        source = getMyGamesDirectory() + L"\\Skyrim";
+        if (FileExists(source, L"skyrim.ini")) {
+          source += L"\\skyrim.ini";
         } else {
-          source.str(L"");
-          source << getGameDirectory() << L"\\skyrim_default.ini";
+          source = getGameDirectory() + L"\\skyrim_default.ini";
         }
       }
-      if (!::CopyFileW(source.str().c_str(), target.c_str(), true)) {
+      if (!::CopyFileW(source.c_str(), target.c_str(), true)) {
         if (::GetLastError() != ERROR_FILE_EXISTS) {
-          std::ostringstream stream;
-          stream << "failed to copy ini file: " << ToString(source.str(), false);
-          throw windows_error(stream.str());
+          throw windows_error(std::string("failed to copy ini file: ") + ToString(source, false));
         }
       }
     }
   }
 
   { // copy skyrimprefs.ini-file
-    std::wstring target = directory.substr().append(L"\\skyrimprefs.ini");
+    std::wstring target = directory + L"\\skyrimprefs.ini";
     if (!FileExists(target)) {
-      std::wostringstream source;
-      source << getMyGamesDirectory() << L"\\Skyrim\\skyrimprefs.ini";
-      if (!::CopyFileW(source.str().c_str(), target.c_str(), true)) {
-        log("failed to copy ini file %ls", source.str().c_str());
+      std::wstring source = getMyGamesDirectory() + L"\\Skyrim\\skyrimprefs.ini";
+      if (!::CopyFileW(source.c_str(), target.c_str(), true)) {
+        log("failed to copy ini file %ls", source.c_str());
         // create empty
         if (::CreateFileW(target.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL) == INVALID_HANDLE_VALUE) {
-          std::ostringstream stream;
-          stream << "failed to copy ini file: " << ToString(source.str(), false);
-          throw windows_error(stream.str());
+          throw windows_error(std::string("failed to copy ini file: ") + ToString(source, false));
         }
       }
     }
-- 
cgit v1.3.1