Changeset 17088 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Feb 24, 2009 6:37:53 PM (16 years ago)

Author:

vboxsync

Message:

RTGetOpt: uShort -> iShort and int.

File:

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

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

@@ -37 +37 @@
 #include <iprt/assert.h>
 #include <iprt/ctype.h>
-#include <limits.h>
 
 
@@ -57 +56 @@
     {
         Assert(!(paOptions[i].fFlags & ~RTGETOPT_VALID_MASK));
-        Assert(paOptions[i].uShort > 0 && paOptions[i].uShort <= (unsigned)INT_MAX);
+        Assert(paOptions[i].iShort > 0);
 
         bool fShort = *pszArgThis == '-'
-                    && (uint32_t)pszArgThis[1] == paOptions[i].uShort
-                    && paOptions[i].uShort;
+                    && (uint32_t)pszArgThis[1] == paOptions[i].iShort;
 
         if ((paOptions[i].fFlags & RTGETOPT_REQ_MASK) != RTGETOPT_REQ_NOTHING)
@@ -180 +178 @@
                         return VERR_INTERNAL_ERROR;
                 }
-                return paOptions[i].uShort;
+                return paOptions[i].iShort;
             }
         }
@@ -190 +188 @@
         {
             pValueUnion->pDef = &paOptions[i];
-            return (int)paOptions[i].uShort;
+            return paOptions[i].iShort;
         }
     }