Changeset 24825 in vbox

Timestamp:

Nov 20, 2009 2:41:05 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: Added RTMsgError, RTMsgErrorV and RTGetOptPrintError.

Location:

trunk

Files:

• include/iprt/getopt.h (modified) (1 diff)
• include/iprt/message.h (added)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/common/misc/getopt.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/misc/message.cpp (added)

trunk/include/iprt/getopt.h

@@ -359 +359 @@
 RTDECL(int) RTGetOptFetchValue(PRTGETOPTSTATE pState, PRTGETOPTUNION pValueUnion, uint32_t fFlags);
 
+/**
+ * Print error messages for a RTGetOpt default case.
+ *
+ * Uses RTMsgError.
+ *
+ * @returns Suitable exit code.
+ *
+ * @param   ch          The RTGetOpt return value.
+ * @param   pValueUnion The value union returned by RTGetOpt.
+ */
+RTDECL(int) RTGetOptPrintError(int ch, PCRTGETOPTUNION pValueUnion);
+
 /** @} */
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -239 +239 @@
         common/misc/handletablectx.cpp \
         common/misc/handletablesimple.cpp \
+        common/misc/message.cpp \
         common/misc/once.cpp \
         common/misc/req.cpp \

trunk/src/VBox/Runtime/common/misc/getopt.cpp

@@ -36 +36 @@
 #include "internal/iprt.h"
 
-#include <iprt/err.h>
-#include <iprt/string.h>
 #include <iprt/assert.h>
 #include <iprt/ctype.h>
+#include <iprt/err.h>
+#include <iprt/message.h>
+#include <iprt/string.h>
 #include <iprt/uuid.h>
 
@@ -640 +641 @@
 }
 RT_EXPORT_SYMBOL(RTGetOptFetchValue);
+
+
+RTDECL(int) RTGetOptPrintError(int ch, PCRTGETOPTUNION pValueUnion)
+{
+    if (ch == VINF_GETOPT_NOT_OPTION)
+        RTMsgError("Invalid parameter: %s", pValueUnion->psz);
+    else if (ch > 0)
+    {
+        if (RT_C_IS_GRAPH(ch))
+            RTMsgError("Unhandled option: -%c", ch);
+        else
+            RTMsgError("Unhandled option: %i (%#x)", ch, ch);
+    }
+    else if (ch == VERR_GETOPT_UNKNOWN_OPTION)
+        RTMsgError("Unknown option: '%s'", pValueUnion->psz);
+    else if (pValueUnion->pDef)
+        RTMsgError("%s: %Rrs\n", pValueUnion->pDef->pszLong, ch);
+    else
+        RTMsgError("%Rrs\n", ch);
+
+    return 2; /** @todo add defines for EXIT_SUCCESS, EXIT_FAILURE, EXIT_INVAL, etc... */
+}
+RT_EXPORT_SYMBOL(RTGetOptPrintError);
+