Cleanup in console code

wichtounet · Sep 27, 2023 · 8d281d7 · 8d281d7
1 parent 519d663
commit 8d281d7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/src/console.cpp b/src/console.cpp
@@ -59,8 +59,8 @@ size_t budget::rsize(const std::string& value) {
         v = v.substr(7);
     }
 
-    static wchar_t buf[1025];
-    return mbstowcs(buf, v.c_str(), 1024);
+    static std::array<wchar_t, 1025> buf;
+    return mbstowcs(buf.data(), v.c_str(), 1024);
 }
 
 size_t budget::rsize_after(const std::string& value) {
@@ -80,8 +80,8 @@ size_t budget::rsize_after(const std::string& value) {
         index = v.find('\033');
     }
 
-    static wchar_t buf[1025];
-    return mbstowcs(buf, v.c_str(), 1024);
+    static std::array<wchar_t, 1025> buf;
+    return mbstowcs(buf.data(), v.c_str(), 1024);
 }
 
 bool budget::option(std::string_view option, std::vector<std::string>& args) {
@@ -159,32 +159,34 @@ std::string budget::get_string_complete(const std::vector<std::string>& choices)
         const char c = getch();
 
         if (+c == 127) {
-            if (!answer.empty()) {
-                std::cout << "\b \b";
-                answer.pop_back();
+            if (answer.empty()) {
+                continue;
             }
+
+            std::cout << "\b \b";
+            answer.pop_back();
         } else if (c == '\r' || c == '\n') {
             std::cout << std::endl;
             return answer;
         } else if (c == '\t') {
-            if (!answer.empty()) {
-                size_t count = 0;
-                std::string valid;
-
-                for (const auto& choice : choices) {
-                    if (choice.size() > answer.size()) {
-                        if (choice.starts_with(answer)) {
-                            ++count;
-                            valid = choice;
-                        }
-                    }
-                }
+            if (answer.empty()) {
+                continue;
+            }
 
-                if (count == 1) {
-                    std::cout << valid.substr(answer.size(), valid.size());
-                    answer = valid;
+            size_t      count = 0;
+            std::string valid;
+
+            for (const auto& choice : choices) {
+                if (choice.size() > answer.size() && choice.starts_with(answer)) {
+                    ++count;
+                    valid = choice;
                 }
             }
+
+            if (count == 1) {
+                std::cout << valid.substr(answer.size(), valid.size());
+                answer = valid;
+            }
         } else if (c == '\033') {
             getch();
 

diff --git a/src/console_writer.cpp b/src/console_writer.cpp
@@ -13,7 +13,7 @@
 
 namespace {
 
-std::string success_to_string(int success) {
+std::string success_to_string(unsigned long success) {
     std::stringstream ss;
 
     if (success < 25) {
@@ -29,7 +29,7 @@ std::string success_to_string(int success) {
     budget::print_minimum(ss, success, 5);
     ss << "%\033[0m  ";
 
-    success     = std::min(success, 109);
+    success     = std::min(success, 109UL);
     const size_t good = success == 0 ? 0 : (success / 10) + 1;
 
     for (size_t i = 0; i < good; ++i) {