Fix missing sizeof(WCHAR)

Fix missing const
allegrofb · Feb 14, 2018 · c5850a0 · c5850a0
1 parent a57fae0
commit c5850a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/include/rang.hpp b/include/rang.hpp
@@ -202,15 +202,14 @@ namespace rang_implementation {
 
         // Check pipe name is template of
         // {"cygwin-","msys-"}XXXXXXXXXXXXXXX-ptyX-XX
-        if (ptrGetFileInformationByHandleEx(h, FileNameInfo, pNameInfo.get(),
-                                            sizeof(MY_FILE_NAME_INFO))) {
-            std::wstring name(pNameInfo->FileName, pNameInfo->FileNameLength);
-            if ((name.find(L"msys-") == std::wstring::npos
-                 && name.find(L"cygwin-") == std::wstring::npos)
-                || name.find(L"-pty") == std::wstring::npos) {
-                return false;
-            }
-        } else {
+        if (!ptrGetFileInformationByHandleEx(h, FileNameInfo, pNameInfo.get(),
+                                             sizeof(MY_FILE_NAME_INFO))) {
+            return false;
+        }
+        std::wstring name(pNameInfo->FileName, pNameInfo->FileNameLength / sizeof(WCHAR));
+        if ((name.find(L"msys-") == std::wstring::npos
+             && name.find(L"cygwin-") == std::wstring::npos)
+            || name.find(L"-pty") == std::wstring::npos) {
             return false;
         }
 

diff --git a/test/colorTest.cpp b/test/colorTest.cpp
@@ -4,7 +4,7 @@
 using namespace std;
 using namespace rang;
 
-void printHeading(string &heading)
+void printHeading(const string &heading)
 {
     cout << '\n'
          << style::reset << heading << style::reset << bg::reset << fg::reset