Feedback from Jonas, and cleanup dev logging

Author: Jlalond

lldb/tools/lldb-dap/lldb-dap.cpp

@@ -55,7 +55,6 @@
 #include <thread>
 #include <vector>
 
-#include <iostream>
 #if defined(_WIN32)
 // We need to #define NOMINMAX in order to skip `min()` and `max()` macro
 // definitions that conflict with other system headers.
@@ -419,21 +418,18 @@ static std::string GetStringFromStructuredData(lldb::SBStructuredData &data,
   if (!keyValue)
     return std::string();
 
-  size_t size = keyValue.GetStringValue(nullptr, 0);
-  std::cout << "Size for " << key << " " << size << std::endl;
-  std::string stringValue;
-  stringValue.resize(size);
-  keyValue.GetStringValue(&stringValue[0], size + 1);
-  std::cout << "String value after: " << stringValue << std::endl;
-  return stringValue;
+  const size_t length = keyValue.GetStringValue(nullptr, 0);
+  std::string str(length + 1, 0);
+  value.GetStringValue(&str[0], length);
+  return str;
 }
 
 static uint64_t GetUintFromStructuredData(lldb::SBStructuredData &data,
                                           const char *key) {
   lldb::SBStructuredData keyValue = data.GetValueForKey(key);
 
   if (!keyValue.IsValid())
-    return -1;
+    return 0;
   return keyValue.GetUnsignedIntegerValue();
 }
 
@@ -456,23 +452,24 @@ void ProgressEventThreadFunction(DAP &dap) {
         lldb::SBStructuredData data =
             lldb::SBDebugger::GetProgressDataFromEvent(event);
 
-        uint64_t progress_id = GetUintFromStructuredData(data, "progress_id");
-        uint64_t completed = GetUintFromStructuredData(data, "completed");
-        uint64_t total = GetUintFromStructuredData(data, "total");
+        const uint64_t progress_id =
+            GetUintFromStructuredData(data, "progress_id");
+        const uint64_t completed = GetUintFromStructuredData(data, "completed");
+        const uint64_t total = GetUintFromStructuredData(data, "total");
+        const std::string details =
+            GetStringFromStructuredData(data, "details");
         std::string message;
         // Include the title on the first event.
         if (completed == 0) {
-          std::string title = GetStringFromStructuredData(data, "title");
+          const std::string title = GetStringFromStructuredData(data, "title");
           message += title;
           message += ": ";
         }
 
-        std::string details = GetStringFromStructuredData(data, "details");
         message += details;
         // Verbose check, but we get -1 for the uint64 on failure to read
         // so we check everything before broadcasting an event.
-        if (message.length() > 0 && progress_id > 0 && total >= 0 &&
-            completed >= 0)
+        if (message.length() > 0)
           dap.SendProgressEvent(progress_id, message.c_str(), completed, total);
       }
     }