Loading...
libkern/c++/OSNumber.cpp xnu-344.49 xnu-792.6.56
--- xnu/xnu-344.49/libkern/c++/OSNumber.cpp
+++ xnu/xnu-792.6.56/libkern/c++/OSNumber.cpp
@@ -2,8 +2,6 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -27,7 +25,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern int sscanf(const char *input, const char *fmt, ...);
+extern unsigned long strtoul(const char *, char **, int);
 __END_DECLS
 
 #include <libkern/c++/OSNumber.h>
@@ -63,18 +61,7 @@
 
 bool OSNumber::init(const char *value, unsigned int numberOfBits)
 {
-    unsigned long long thisOffset;
-
-#ifdef q_works
-    sscanf(value, "%qi", thisOffset);
-#else
-    unsigned int smallOffset;
-
-    sscanf(value, "%i", &smallOffset);
-    thisOffset = smallOffset;
-#endif
-
-    return init(thisOffset, numberOfBits);
+    return init((unsigned long long)strtoul(value, NULL, 0), numberOfBits);
 }
 
 void OSNumber::free() { super::free(); }
@@ -85,7 +72,7 @@
     OSNumber *me = new OSNumber;
 
     if (me && !me->init(value, numberOfBits)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -97,7 +84,7 @@
     OSNumber *me = new OSNumber;
 
     if (me && !me->init(value, numberOfBits)) {
-        me->free();
+        me->release();
         return 0;
     }