[Lldb-commits] [lldb] r152084 - /lldb/trunk/source/Commands/CommandObjectMemory.cpp

[Johnny Chen]

Author: johnny
Date: Mon Mar  5 19:17:59 2012
New Revision: 152084

URL: http://llvm.org/viewvc/llvm-project?rev=152084&view=rev
Log:
rdar://problem/10267705

Clarification on the error message when the display format (eFormatBytes/eFormatBytesWithASCII) conflicts
with the byte size.

Modified:
    lldb/trunk/source/Commands/CommandObjectMemory.cpp

Modified: lldb/trunk/source/Commands/CommandObjectMemory.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectMemory.cpp?rev=152084&r1=152083&r2=152084&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectMemory.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectMemory.cpp Mon Mar  5 19:17:59 2012
@@ -181,7 +181,9 @@
                 if (byte_size_option_set)
                 {
                     if (byte_size_value > 1)
-                        error.SetErrorString ("use --count option to specify an end address to display a number of bytes");
+                        error.SetErrorStringWithFormat ("display format (bytes/bytes with ascii) conflicts with the specified byte size %llu\n"
+                                                        "\tconsider using a different display format or don't specify the byte size",
+                                                        byte_size_value.GetCurrentValue());
                 }
                 else
                     byte_size_value = 1;