Combine eArgTypeSignalName and eArgTypeUnixSignalNumber into a single

argument type, eArgTypeUnixSignal.

llvm-svn: 116764

3 files changed, 8 insertions, 10 deletions

diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h
index ef6c03a6779..e29473e2277 100644
--- a/lldb/include/lldb/lldb-enumerations.h
+++ b/lldb/include/lldb/lldb-enumerations.h
@@ -558,7 +558,6 @@ typedef enum CommandArgumentType
     eArgTypeSettingKey,
     eArgTypeSettingPrefix,
     eArgTypeSettingVariableName,
-    eArgTypeSignalName,
     eArgTypeShlibName,
     eArgTypeSourceFile,
     eArgTypeSortOrder,
@@ -567,7 +566,7 @@ typedef enum CommandArgumentType
     eArgTypeThreadID,
     eArgTypeThreadIndex,
     eArgTypeThreadName,
-    eArgTypeUnixSignalNumber,
+    eArgTypeUnixSignal,
     eArgTypeVarName,
     eArgTypeValue,
     eArgTypeWidth,
diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp
index e357934f3ef..ea3bd95dffc 100644
--- a/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/lldb/source/Commands/CommandObjectProcess.cpp
@@ -877,7 +877,7 @@ public:
         CommandArgumentData signal_arg;
         
         // Define the first (and only) variant of this arg.
-        signal_arg.arg_type = eArgTypeUnixSignalNumber;
+        signal_arg.arg_type = eArgTypeUnixSignal;
         signal_arg.arg_repetition = eArgRepeatPlain;
         
         // There is only one variant this argument could be; put it into the argument entry.
@@ -1219,12 +1219,12 @@ public:
     {
         SetHelpLong ("If no signals are specified, update them all.  If no update option is specified, list the current values.\n");
         CommandArgumentEntry arg;
-        CommandArgumentData signal_name_arg;
+        CommandArgumentData signal_arg;
 
-        signal_name_arg.arg_type = eArgTypeSignalName;
-        signal_name_arg.arg_repetition = eArgRepeatStar;
+        signal_arg.arg_type = eArgTypeUnixSignal;
+        signal_arg.arg_repetition = eArgRepeatStar;
 
-        arg.push_back (signal_name_arg);
+        arg.push_back (signal_arg);
         
         m_arguments.push_back (arg);
     }
diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp
index d389cfeb72c..eb84378841e 100644
--- a/lldb/source/Interpreter/CommandObject.cpp
+++ b/lldb/source/Interpreter/CommandObject.cpp
@@ -646,8 +646,7 @@ CommandObject::g_arguments_data[] =
     { eArgTypeSettingIndex, "setting-index", CommandCompletions::eNoCompletion, NULL, "An index into a settings variable that is an array (try 'settings list' to see all the possible settings variables and their types)." },
     { eArgTypeSettingKey, "setting-key", CommandCompletions::eNoCompletion, NULL, "A key into a settings variables that is a dictionary (try 'settings list' to see all the possible settings variables and their types)." },
     { eArgTypeSettingPrefix, "setting-prefix", CommandCompletions::eNoCompletion, NULL, "The name of a settable internal debugger variable up to a dot ('.'), e.g. 'target.process.'" },
-    { eArgTypeSettingVariableName, "setting-variable-name", CommandCompletions::eNoCompletion, NULL, "The name of a settable internal debugger variable.  Type 'settings list' to see a complete list of such variables." },
-    { eArgTypeSignalName, "signal-name", CommandCompletions::eNoCompletion, NULL, "The name of a UNIX signal (e.g. SIGINT or SIGKILL) ." },
+    { eArgTypeSettingVariableName, "setting-variable-name", CommandCompletions::eNoCompletion, NULL, "The name of a settable internal debugger variable.  Type 'settings list' to see a complete list of such variables." }, 
     { eArgTypeShlibName, "shlib-name", CommandCompletions::eNoCompletion, NULL, "The name of a shared library." },
     { eArgTypeSourceFile, "source-file", CommandCompletions::eNoCompletion, NULL, "The name of a source file.." },
     { eArgTypeSortOrder, "sort-order", CommandCompletions::eNoCompletion, NULL, "Specify a sort order when dumping lists." },
@@ -656,7 +655,7 @@ CommandObject::g_arguments_data[] =
     { eArgTypeThreadID, "thread-id", CommandCompletions::eNoCompletion, NULL, "Thread ID number." },
     { eArgTypeThreadIndex, "thread-index", CommandCompletions::eNoCompletion, NULL, "Index into the process' list of threads." },
     { eArgTypeThreadName, "thread-name", CommandCompletions::eNoCompletion, NULL, "The thread's name." },
-    { eArgTypeUnixSignalNumber, "unix-signal-number", CommandCompletions::eNoCompletion, NULL, "A valid Unix signal number." },
+    { eArgTypeUnixSignal, "unix-signal", CommandCompletions::eNoCompletion, NULL, "A valid Unix signal name or number (e.g. SIGKILL, KILL or 9)." },
     { eArgTypeVarName, "variable-name", CommandCompletions::eNoCompletion, NULL, "The name of a variable in your program." },
     { eArgTypeValue, "value", CommandCompletions::eNoCompletion, NULL, "A value could be anything, depending on where and how it is used." },
     { eArgTypeWidth, "width", CommandCompletions::eNoCompletion, NULL, "Help text goes here." },