Changeset 25323 in vbox

Timestamp:

Dec 11, 2009 12:27:17 PM (15 years ago)

Author:

vboxsync

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

55902

Message:

iprt/getopt.h/cpp: Made the uIndex 32-bit instead of 64-bit as we don't need 64-bit and it only causes lots of warnings when compiling VBoxManage with MSC.

Location:

trunk

Files:

• include/iprt/getopt.h (modified) (1 diff)
• src/VBox/Runtime/common/misc/getopt.cpp (modified) (3 diffs)
• src/VBox/Runtime/testcase/tstGetOpt.cpp (modified) (3 diffs)

trunk/include/iprt/getopt.h

@@ -203 +203 @@
     /** The option definition which matched. NULL otherwise. */
     PCRTGETOPTDEF   pDef;
-    /** The index of an index option, otherwise UINT64_MAX. */
-    uint64_t        uIndex;
+    /** The index of an index option, otherwise UINT32_MAX. */
+    uint32_t        uIndex;
     /* More members will be added later for dealing with initial
        call, optional sorting, '--' and so on. */

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

@@ -401 +401 @@
      */
     pState->pDef = NULL;
-    pState->uIndex = UINT64_MAX;
+    pState->uIndex = UINT32_MAX;
 
     /*
@@ -512 +512 @@
                         return VERR_GETOPT_INDEX_MISSING;
 
-                    uint64_t uIndex;
+                    uint32_t uIndex;
                     char *pszRet = NULL;
-                    int rc = RTStrToUInt64Ex(&pszArgThis[cchLong], &pszRet, 10, &uIndex);
+                    int rc = RTStrToUInt32Ex(&pszArgThis[cchLong], &pszRet, 10, &uIndex);
                     if (rc == VWRN_TRAILING_CHARS)
                     {
@@ -584 +584 @@
                 return VERR_GETOPT_INDEX_MISSING;
 
-            uint64_t uIndex;
+            uint32_t uIndex;
             char *pszRet = NULL;
-            if (RTStrToUInt64Full(&pszArgThis[cchLong], 10, &uIndex) == VINF_SUCCESS)
+            if (RTStrToUInt32Full(&pszArgThis[cchLong], 10, &uIndex) == VINF_SUCCESS)
                 pState->uIndex = uIndex;
             else

trunk/src/VBox/Runtime/testcase/tstGetOpt.cpp

@@ -172 +172 @@
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 's', 2);
     CHECK(VALID_PTR(Val.psz) && !strcmp(Val.psz, "string1"));
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 's', 2);
     CHECK(VALID_PTR(Val.psz) && !strcmp(Val.psz, "string2"));
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
 
     /* -i */
@@ -301 +301 @@
 
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 404, 1);
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
 
     /* RTGetOptFetchValue tests */
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 405, 2);
     CHECK(VALID_PTR(Val.psz) && !strcmp(Val.psz, "firstvalue"));
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
     CHECK_GETOPT(RTGetOptFetchValue(&GetState, &Val, RTGETOPT_REQ_STRING), VINF_SUCCESS, 1);
     CHECK(VALID_PTR(Val.psz) && !strcmp(Val.psz, "secondvalue"));
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
 
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 405, 1);
     CHECK(VALID_PTR(Val.psz) && !strcmp(Val.psz, "firstvalue"));
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
     CHECK_GETOPT(RTGetOptFetchValue(&GetState, &Val, RTGETOPT_REQ_STRING), VINF_SUCCESS, 1);
     CHECK(VALID_PTR(Val.psz) && !strcmp(Val.psz, "secondvalue"));
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
 
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 406, 2);
@@ -334 +334 @@
     CHECK_GETOPT(RTGetOpt(&GetState, &Val), 407, 2);
     CHECK(Val.u32 == 1);
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
     CHECK_GETOPT(RTGetOptFetchValue(&GetState, &Val, RTGETOPT_REQ_UINT32), VINF_SUCCESS, 1);
     CHECK(Val.u32 == 12);
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
     CHECK_GETOPT(RTGetOptFetchValue(&GetState, &Val, RTGETOPT_REQ_STRING), VINF_SUCCESS, 1);
     CHECK(VALID_PTR(Val.psz) && !strcmp(Val.psz, "thirdvalue"));
-    CHECK(GetState.uIndex == UINT64_MAX);
+    CHECK(GetState.uIndex == UINT32_MAX);
 
     /* bool on/off tests */