Changeset 96058 in vbox

Timestamp:

Aug 5, 2022 11:09:17 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: Added strtoull. bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/string/nocrt-strtoull.cpp (copied) (copied from trunk/src/VBox/Runtime/common/string/nocrt-strtoul.cpp ) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1805 +1805 @@
         common/string/nocrt-strtoll.cpp \
         common/string/nocrt-strtoul.cpp \
+        common/string/nocrt-strtoull.cpp \
         common/string/strtok_r.cpp \
         r3/nocrt-per-thread-1.cpp \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - strtoul.
+ * IPRT - No-CRT - strtoull.
  */
 
@@ -38 +38 @@
 
 
-#undef strtoul
-unsigned long RT_NOCRT(strtoul)(const char *psz, char **ppszNext, int iBase)
+#undef strtoull
+unsigned long long RT_NOCRT(strtoull)(const char *psz, char **ppszNext, int iBase)
 {
-#if LONG_BIT == 64
+#if LLONG_BIT == 64
     uint64_t uValue = 0;
     int rc = RTStrToUInt64Ex(psz, ppszNext, (unsigned)iBase, &uValue);
-#elif LONG_BIT == 32
-    uint32_t uValue = 0;
-    int rc = RTStrToUInt32Ex(psz, ppszNext, (unsigned)iBase, &uValue);
 #else
-# error "Unsupported LONG_BIT value"
+# error "Unsupported LLONG_BIT value"
 #endif
     if (rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS || rc == VWRN_TRAILING_SPACES || rc == VWRN_NEGATIVE_UNSIGNED)