--- xnu/xnu-792.22.5/libkern/c++/OSNumber.cpp
+++ xnu/xnu-1504.7.4/libkern/c++/OSNumber.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -29,10 +29,6 @@
 
 #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>
@@ -53,30 +49,30 @@
 OSMetaClassDefineReservedUnused(OSNumber, 6);
 OSMetaClassDefineReservedUnused(OSNumber, 7);
 
-bool OSNumber::init(unsigned long long inValue, unsigned int numberOfBits)
+bool OSNumber::init(unsigned long long inValue, unsigned int newNumberOfBits)
 {
     if (!super::init())
         return false;
 
-    size = numberOfBits;
+    size = newNumberOfBits;
     value = (inValue & sizeMask);
 
     return true;
 }
 
-bool OSNumber::init(const char *value, unsigned int numberOfBits)
+bool OSNumber::init(const char *newValue, unsigned int newNumberOfBits)
 {
-    return init((unsigned long long)strtoul(value, NULL, 0), numberOfBits);
+    return init((unsigned long long)strtoul(newValue, NULL, 0), newNumberOfBits);
 }
 
 void OSNumber::free() { super::free(); }
 
 OSNumber *OSNumber::withNumber(unsigned long long value,
-                           unsigned int numberOfBits)
+                           unsigned int newNumberOfBits)
 {
     OSNumber *me = new OSNumber;
 
-    if (me && !me->init(value, numberOfBits)) {
+    if (me && !me->init(value, newNumberOfBits)) {
         me->release();
         return 0;
     }
@@ -84,11 +80,11 @@
     return me;
 }
 
-OSNumber *OSNumber::withNumber(const char *value, unsigned int numberOfBits)
+OSNumber *OSNumber::withNumber(const char *value, unsigned int newNumberOfBits)
 {
     OSNumber *me = new OSNumber;
 
-    if (me && !me->init(value, numberOfBits)) {
+    if (me && !me->init(value, newNumberOfBits)) {
         me->release();
         return 0;
     }
@@ -151,15 +147,15 @@
     
     if (s->previouslySerialized(this)) return true;
 
-    sprintf(temp, "integer size=\"%d\"", size); 
+    snprintf(temp, sizeof(temp), "integer size=\"%d\"", size); 
     if (!s->addXMLStartTag(this, temp)) return false;
     
     //XXX    sprintf(temp, "0x%qx", value);
     if ((value >> 32)) {
-        sprintf(temp, "0x%lx%08lx", (unsigned long)(value >> 32),
+        snprintf(temp, sizeof(temp), "0x%lx%08lx", (unsigned long)(value >> 32),
                     (unsigned long)(value & 0xFFFFFFFF));
     } else { 
-        sprintf(temp, "0x%lx", (unsigned long)value);
+        snprintf(temp, sizeof(temp), "0x%lx", (unsigned long)value);
     }
     if (!s->addString(temp)) return false;