Loading...
--- xnu/xnu-3248.30.4/libkern/c++/OSNumber.cpp
+++ xnu/xnu-1228/libkern/c++/OSNumber.cpp
@@ -29,6 +29,10 @@
#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>
@@ -49,30 +53,30 @@
OSMetaClassDefineReservedUnused(OSNumber, 6);
OSMetaClassDefineReservedUnused(OSNumber, 7);
-bool OSNumber::init(unsigned long long inValue, unsigned int newNumberOfBits)
+bool OSNumber::init(unsigned long long inValue, unsigned int numberOfBits)
{
if (!super::init())
return false;
- size = newNumberOfBits;
+ size = numberOfBits;
value = (inValue & sizeMask);
return true;
}
-bool OSNumber::init(const char *newValue, unsigned int newNumberOfBits)
+bool OSNumber::init(const char *value, unsigned int numberOfBits)
{
- return init((unsigned long long)strtoul(newValue, NULL, 0), newNumberOfBits);
+ return init((unsigned long long)strtoul(value, NULL, 0), numberOfBits);
}
void OSNumber::free() { super::free(); }
OSNumber *OSNumber::withNumber(unsigned long long value,
- unsigned int newNumberOfBits)
+ unsigned int numberOfBits)
{
OSNumber *me = new OSNumber;
- if (me && !me->init(value, newNumberOfBits)) {
+ if (me && !me->init(value, numberOfBits)) {
me->release();
return 0;
}
@@ -80,11 +84,11 @@
return me;
}
-OSNumber *OSNumber::withNumber(const char *value, unsigned int newNumberOfBits)
+OSNumber *OSNumber::withNumber(const char *value, unsigned int numberOfBits)
{
OSNumber *me = new OSNumber;
- if (me && !me->init(value, newNumberOfBits)) {
+ if (me && !me->init(value, numberOfBits)) {
me->release();
return 0;
}