Changeset 14740 in vbox

Timestamp:

Nov 27, 2008 7:57:49 PM (16 years ago)

Author:

vboxsync

Message:

some changes missed during last split

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp

@@ -245 +245 @@
     com::SafeArray<BSTR>          baseMetrics;
     com::SafeIfaceArray<IUnknown> objects;
-    ULONG period = 1, samples = 1;
+    uint32_t period = 1, samples = 1;
     bool listMatches = false;
     int i;
@@ -255 +255 @@
             if (argc <= i + 1)
                 return errorArgument("Missing argument to '%s'", argv[i]);
-            char *endptr = NULL;
-            period = strtoul (argv[++i], &endptr, 10);
-            if (!endptr || *endptr || !period)
+            if (   VINF_SUCCESS != RTStrToUInt32Full(argv[++i], 10, &period)
+                || !period)
                 return errorArgument("Invalid value for 'period' parameter: '%s'", argv[i]);
         }
@@ -264 +263 @@
             if (argc <= i + 1)
                 return errorArgument("Missing argument to '%s'", argv[i]);
-            char *endptr = NULL;
-            samples = strtoul (argv[++i], &endptr, 10);
-            if (!endptr || *endptr)
+            if (   VINF_SUCCESS != RTStrToUInt32Full(argv[++i], 10, &samples)
+                || !samples)
                 return errorArgument("Invalid value for 'samples' parameter: '%s'", argv[i]);
         }
@@ -413 +411 @@
     com::SafeArray<BSTR>          baseMetrics;
     com::SafeIfaceArray<IUnknown> objects;
-    ULONG period = 1, samples = 1;
+    uint32_t period = 1, samples = 1;
     bool isDetached = false, listMatches = false;
     int i;
@@ -422 +420 @@
             if (argc <= i + 1)
                 return errorArgument("Missing argument to '%s'", argv[i]);
-            char *endptr = NULL;
-            period = strtoul (argv[++i], &endptr, 10);
-            if (!endptr || *endptr || !period)
+            if (   VINF_SUCCESS != RTStrToUInt32Full(argv[++i], 10, &period)
+                || !period)
                 return errorArgument("Invalid value for 'period' parameter: '%s'", argv[i]);
         }
@@ -431 +428 @@
             if (argc <= i + 1)
                 return errorArgument("Missing argument to '%s'", argv[i]);
-            char *endptr = NULL;
-            samples = strtoul (argv[++i], &endptr, 10);
-            if (!endptr || *endptr || !samples)
+            if (   VINF_SUCCESS != RTStrToUInt32Full(argv[++i], 10, &samples)
+                || !samples)
                 return errorArgument("Invalid value for 'samples' parameter: '%s'", argv[i]);
         }