Loading...
--- xnu/xnu-792.6.70/libkern/c++/OSNumber.cpp
+++ xnu/xnu-201.19/libkern/c++/OSNumber.cpp
@@ -21,12 +21,6 @@
*/
/* IOOffset.m created by rsulack on Wed 17-Sep-1997 */
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern unsigned long strtoul(const char *, char **, int);
-__END_DECLS
-
#include <libkern/c++/OSNumber.h>
#include <libkern/c++/OSString.h>
#include <libkern/c++/OSSerialize.h>
@@ -37,7 +31,6 @@
#define super OSObject
OSDefineMetaClassAndStructors(OSNumber, OSObject)
-
OSMetaClassDefineReservedUnused(OSNumber, 0);
OSMetaClassDefineReservedUnused(OSNumber, 1);
OSMetaClassDefineReservedUnused(OSNumber, 2);
@@ -60,7 +53,18 @@
bool OSNumber::init(const char *value, unsigned int numberOfBits)
{
- return init((unsigned long long)strtoul(value, NULL, 0), 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);
}
void OSNumber::free() { super::free(); }
@@ -71,7 +75,7 @@
OSNumber *me = new OSNumber;
if (me && !me->init(value, numberOfBits)) {
- me->release();
+ me->free();
return 0;
}
@@ -83,7 +87,7 @@
OSNumber *me = new OSNumber;
if (me && !me->init(value, numberOfBits)) {
- me->release();
+ me->free();
return 0;
}