[Lldb-commits] [lldb] r170266 - in /lldb/trunk: include/lldb/Interpreter/CommandReturnObject.h source/API/SBCommandReturnObject.cpp source/Commands/CommandObjectTarget.cpp source/Interpreter/CommandReturnObject.cpp

[Jim Ingham]

Author: jingham
Date: Fri Dec 14 20:40:54 2012
New Revision: 170266

URL: http://llvm.org/viewvc/llvm-project?rev=170266&view=rev
Log:
Remove the “len” defaulted parameter from CommandReturnObject::AppendMessage, AppendWarning and AppendError.  Nobody was using them, and it meant if you accidentally used the AppendWarning when you meant AppendWarningWithFormat with an integer in the format string, it would compile and then return your string plus some unknown amount of junk.

Modified:
    lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h
    lldb/trunk/source/API/SBCommandReturnObject.cpp
    lldb/trunk/source/Commands/CommandObjectTarget.cpp
    lldb/trunk/source/Interpreter/CommandReturnObject.cpp

Modified: lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h?rev=170266&r1=170265&r2=170266&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h (original)
+++ lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h Fri Dec 14 20:40:54 2012
@@ -118,7 +118,7 @@
     Clear();
 
     void
-    AppendMessage (const char *in_string, int len = -1);
+    AppendMessage (const char *in_string);
 
     void
     AppendMessageWithFormat (const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
@@ -127,13 +127,13 @@
     AppendRawWarning (const char *in_string, int len = -1);
 
     void
-    AppendWarning (const char *in_string, int len = -1);
+    AppendWarning (const char *in_string);
 
     void
     AppendWarningWithFormat (const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
 
     void
-    AppendError (const char *in_string, int len = -1);
+    AppendError (const char *in_string);
 
     void
     AppendRawError (const char *in_string, int len = -1);

Modified: lldb/trunk/source/API/SBCommandReturnObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBCommandReturnObject.cpp?rev=170266&r1=170265&r2=170266&view=diff
==============================================================================
--- lldb/trunk/source/API/SBCommandReturnObject.cpp (original)
+++ lldb/trunk/source/API/SBCommandReturnObject.cpp Fri Dec 14 20:40:54 2012
@@ -281,7 +281,17 @@
 {
     if (m_opaque_ap.get())
     {
-        m_opaque_ap->AppendMessage(string, len);
+        if (len == 0)
+        {
+            return;
+        }
+        else if (len > 0)
+        {
+            std::string buffer(string, len);
+            m_opaque_ap->AppendMessage(buffer.c_str());
+        }
+        else
+            m_opaque_ap->AppendMessage(string);
     }
 }
 

Modified: lldb/trunk/source/Commands/CommandObjectTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectTarget.cpp?rev=170266&r1=170265&r2=170266&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectTarget.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectTarget.cpp Fri Dec 14 20:40:54 2012
@@ -876,7 +876,7 @@
                                                               comp_unit->GetDirectory().GetCString(), 
                                                               comp_unit->GetFilename().GetCString());
                             else
-                                result.AppendError ("no debug information for frame %u\n", frame->GetFrameIndex());
+                                result.AppendErrorWithFormat ("no debug information for frame %u\n", frame->GetFrameIndex());
                         }                        
                         else
                             result.AppendError ("'target variable' takes one or more global variable names as arguments\n");
@@ -3152,13 +3152,13 @@
                         }
                         else
                         {
-                            result.AppendError ("Couldn't find module matching address: 0x%" PRIx64 ".", m_options.m_module_addr);
+                            result.AppendErrorWithFormat ("Couldn't find module matching address: 0x%" PRIx64 ".", m_options.m_module_addr);
                             result.SetStatus (eReturnStatusFailed);
                         }
                     }
                     else
                     {
-                        result.AppendError ("Couldn't find module containing address: 0x%" PRIx64 ".", m_options.m_module_addr);
+                        result.AppendErrorWithFormat ("Couldn't find module containing address: 0x%" PRIx64 ".", m_options.m_module_addr);
                         result.SetStatus (eReturnStatusFailed);
                     }
                 }

Modified: lldb/trunk/source/Interpreter/CommandReturnObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandReturnObject.cpp?rev=170266&r1=170265&r2=170266&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandReturnObject.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandReturnObject.cpp Fri Dec 14 20:40:54 2012
@@ -104,24 +104,19 @@
 }
 
 void
-CommandReturnObject::AppendMessage (const char *in_string, int len)
+CommandReturnObject::AppendMessage (const char *in_string)
 {
-    if (!in_string || len == 0)
+    if (!in_string || *in_string == '\0')
         return;
-    if (len < 0)
-	    GetOutputStream().Printf("%s\n", in_string);
-	else
-	    GetOutputStream().Printf("%*.*s\n", len, len, in_string);
+    GetOutputStream().Printf("%s\n", in_string);
 }
 
 void
-CommandReturnObject::AppendWarning (const char *in_string, int len)
+CommandReturnObject::AppendWarning (const char *in_string)
 {
-    if (!in_string)
+    if (!in_string || *in_string == '\0')
         return;
-    if (len < 0)
-        len = ::strlen (in_string);
-    GetErrorStream().Printf("warning: %*.*s\n", len, len, in_string);
+    GetErrorStream().Printf("warning: %s\n", in_string);
 }
 
 // Similar to AppendWarning, but do not prepend 'warning: ' to message, and
@@ -138,13 +133,11 @@
 }
 
 void
-CommandReturnObject::AppendError (const char *in_string, int len)
+CommandReturnObject::AppendError (const char *in_string)
 {
-    if (!in_string)
+    if (!in_string || *in_string == '\0')
         return;
-    if (len < 0)
-        len = ::strlen (in_string);
-    GetErrorStream().Printf ("error: %*.*s\n", len, len, in_string);
+    GetErrorStream().Printf ("error: %s\n", in_string);
 }
 
 void