Changeset 83979 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Apr 26, 2020 1:28:56 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137546

Message:

Add/Nt/Installer: Simple installer program for NT 3.x.

File:

• trunk/src/VBox/Runtime/common/misc/getopt.cpp (modified) (6 diffs)

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

@@ -40 +40 @@
 #include <iprt/string.h>
 #include <iprt/uuid.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
+#ifdef IPRT_MINIMAL
+# define RTStrICmp  RTStrICmpAscii
+# define RTStrNICmp RTStrNICmpAscii
+#else
+#endif
 
 
@@ -91 +101 @@
 RT_EXPORT_SYMBOL(RTGetOptInit);
 
+#ifndef IPRT_GETOPT_WITHOUT_NETWORK_ADDRESSES
 
 /**
@@ -128 +139 @@
 }
 
+#endif /* IPRT_GETOPT_WITHOUT_NETWORK_ADDRESSES */
 
 /**
@@ -370 +382 @@
 #undef MY_BASE_INT_CASE
 
+#ifndef IPRT_GETOPT_WITHOUT_NETWORK_ADDRESSES
+
         case RTGETOPT_REQ_IPV4ADDR:
         {
@@ -398 +412 @@
             break;
         }
+
+#endif /* IPRT_GETOPT_WITHOUT_NETWORK_ADDRESSES */
 
         case RTGETOPT_REQ_UUID:
@@ -442 +458 @@
                             { /* likely */ } \
                             else \
-                               { RTAssertMsg2("z rc=%Rrc: '%s' '%s' uBase=%d\n", rc, pszValue, pszNext, uBase); return VERR_GETOPT_INVALID_ARGUMENT_FORMAT; } \
+                                AssertMsgFailedReturn(("z rc=%Rrc: '%s' '%s' uBase=%d\n", rc, pszValue, pszNext, uBase), \
+                                                       VERR_GETOPT_INVALID_ARGUMENT_FORMAT); \
                         } \
                         else if (fSwitchValue != (a_fReqValueOptional)) \
-                        { RTAssertMsg2("x\n"); return VERR_GETOPT_INVALID_ARGUMENT_FORMAT; } \
+                            AssertMsgFailedReturn(("x\n"), VERR_GETOPT_INVALID_ARGUMENT_FORMAT); \
                     } \
                     else if (fSwitchValue != (a_fReqValueOptional)) \
-                        { RTAssertMsg2("y\n"); return VERR_GETOPT_INVALID_ARGUMENT_FORMAT; } \
+                        AssertMsgFailedReturn(("y\n"), VERR_GETOPT_INVALID_ARGUMENT_FORMAT); \
                     pValueUnion->a_MemberPrefix##Second = Value2; \
                     pValueUnion->a_MemberPrefix##First  = Value1; \