Changeset 96056 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Aug 5, 2022 11:03:58 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: Added strtoll and strtoul. bugref:10261

Location:

trunk/src/VBox/Runtime/common/string

Files:

• nocrt-strtoll.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/nocrt-strtol.cpp ) (2 diffs)
• nocrt-strtoul.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/nocrt-strtol.cpp ) (2 diffs)

trunk/src/VBox/Runtime/common/string/nocrt-strtoll.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - strtol.
+ * IPRT - No-CRT - strtoll.
  */
 
@@ -37 +37 @@
 
 
-#undef strtol
-long RT_NOCRT(strtol)(const char *psz, char **ppszNext, int iBase)
+#undef strtoll
+long long RT_NOCRT(strtoll)(const char *psz, char **ppszNext, int iBase)
 {
-#if LONG_BIT == 64
+#if LLONG_BIT == 64
     int64_t iValue = 0;
     int rc = RTStrToInt64Ex(psz, ppszNext, (unsigned)iBase, &iValue);
-#elif LONG_BIT == 32
-    int32_t iValue = 0;
-    int rc = RTStrToInt32Ex(psz, ppszNext, (unsigned)iBase, &iValue);
 #else
-# error "Unsupported LONG_BIT value"
+# error "Unsupported LLONG_BIT value"
 #endif
     if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS || rc == VWRN_TRAILING_SPACES)

trunk/src/VBox/Runtime/common/string/nocrt-strtoul.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - strtol.
+ * IPRT - No-CRT - strtoul.
  */
 
@@ -37 +37 @@
 
 
-#undef strtol
-long RT_NOCRT(strtol)(const char *psz, char **ppszNext, int iBase)
+#undef strtoul
+long RT_NOCRT(strtoul)(const char *psz, char **ppszNext, int iBase)
 {
-#if LONG_BIT == 64
-    int64_t iValue = 0;
-    int rc = RTStrToInt64Ex(psz, ppszNext, (unsigned)iBase, &iValue);
-#elif LONG_BIT == 32
-    int32_t iValue = 0;
-    int rc = RTStrToInt32Ex(psz, ppszNext, (unsigned)iBase, &iValue);
+#if ULONG_BIT == 64
+    uint64_t uValue = 0;
+    int rc = RTStrToUInt64Ex(psz, ppszNext, (unsigned)iBase, &uiValue);
+#elif ULONG_BIT == 32
+    int32_t uValue = 0;
+    int rc = RTStrToUInt32Ex(psz, ppszNext, (unsigned)iBase, &uiValue);
 #else
 # error "Unsupported LONG_BIT value"
 #endif
-    if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS || rc == VWRN_TRAILING_SPACES)
-        return iValue;
+    if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS || rc == VWRN_TRAILING_SPACES || rc == VWRN_NEGATIVE_UNSIGNED)
+        return uValue;
     if (rc == VWRN_NUMBER_TOO_BIG)
     {
         errno = ERANGE;
-        return iValue < 0 ? LONG_MIN : LONG_MAX;
+        return ULONG_MAX;
     }
     errno = EINVAL;