Loading...
--- xnu/xnu-201/libkern/c++/OSNumber.cpp
+++ xnu/xnu-6153.141.1/libkern/c++/OSNumber.cpp
@@ -1,25 +1,33 @@
/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/* IOOffset.m created by rsulack on Wed 17-Sep-1997 */
+
+#include <sys/cdefs.h>
#include <libkern/c++/OSNumber.h>
#include <libkern/c++/OSString.h>
@@ -31,6 +39,7 @@
#define super OSObject
OSDefineMetaClassAndStructors(OSNumber, OSObject)
+
OSMetaClassDefineReservedUnused(OSNumber, 0);
OSMetaClassDefineReservedUnused(OSNumber, 1);
OSMetaClassDefineReservedUnused(OSNumber, 2);
@@ -40,126 +49,151 @@
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;
+ if (!super::init()) {
+ return false;
+ }
+ if (newNumberOfBits > 64) {
+ return false;
+ }
- size = numberOfBits;
- value = (inValue & sizeMask);
+ size = newNumberOfBits;
+ value = (inValue & sizeMask);
- return true;
+ return true;
}
-bool OSNumber::init(const char *value, unsigned int numberOfBits)
+bool
+OSNumber::init(const char *newValue, unsigned int newNumberOfBits)
{
- 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(newValue, NULL, 0), newNumberOfBits);
}
-void OSNumber::free() { super::free(); }
-
-OSNumber *OSNumber::withNumber(unsigned long long value,
- unsigned int numberOfBits)
+void
+OSNumber::free()
{
- OSNumber *me = new OSNumber;
-
- if (me && !me->init(value, numberOfBits)) {
- me->free();
- return 0;
- }
-
- return me;
+ super::free();
}
-OSNumber *OSNumber::withNumber(const char *value, unsigned int numberOfBits)
+OSNumber *
+OSNumber::withNumber(unsigned long long value,
+ unsigned int newNumberOfBits)
{
- OSNumber *me = new OSNumber;
+ OSNumber *me = new OSNumber;
- if (me && !me->init(value, numberOfBits)) {
- me->free();
- return 0;
- }
+ if (me && !me->init(value, newNumberOfBits)) {
+ me->release();
+ return NULL;
+ }
- return me;
+ return me;
}
-unsigned int OSNumber::numberOfBits() const { return size; }
+OSNumber *
+OSNumber::withNumber(const char *value, unsigned int newNumberOfBits)
+{
+ OSNumber *me = new OSNumber;
-unsigned int OSNumber::numberOfBytes() const { return (size + 7) / 8; }
+ if (me && !me->init(value, newNumberOfBits)) {
+ me->release();
+ return NULL;
+ }
+
+ return me;
+}
+
+unsigned int
+OSNumber::numberOfBits() const
+{
+ return size;
+}
+
+unsigned int
+OSNumber::numberOfBytes() const
+{
+ return (size + 7) / 8;
+}
-unsigned char OSNumber::unsigned8BitValue() const
+unsigned char
+OSNumber::unsigned8BitValue() const
{
- return (unsigned char) value;
+ return (unsigned char) value;
}
-unsigned short OSNumber::unsigned16BitValue() const
+unsigned short
+OSNumber::unsigned16BitValue() const
{
- return (unsigned short) value;
+ return (unsigned short) value;
}
-unsigned int OSNumber::unsigned32BitValue() const
+unsigned int
+OSNumber::unsigned32BitValue() const
{
- return (unsigned int) value;
+ return (unsigned int) value;
}
-unsigned long long OSNumber::unsigned64BitValue() const
+unsigned long long
+OSNumber::unsigned64BitValue() const
{
- return value;
+ return value;
}
-void OSNumber::addValue(signed long long inValue)
+void
+OSNumber::addValue(signed long long inValue)
{
- value = ((value + inValue) & sizeMask);
+ value = ((value + inValue) & sizeMask);
}
-void OSNumber::setValue(unsigned long long inValue)
+void
+OSNumber::setValue(unsigned long long inValue)
{
- value = (inValue & sizeMask);
+ value = (inValue & sizeMask);
}
-bool OSNumber::isEqualTo(const OSNumber *integer) const
+bool
+OSNumber::isEqualTo(const OSNumber *integer) const
{
- return((value == integer->value));
+ return value == integer->value;
}
-bool OSNumber::isEqualTo(const OSMetaClassBase *obj) const
+bool
+OSNumber::isEqualTo(const OSMetaClassBase *obj) const
{
- OSNumber * offset;
- if ((offset = OSDynamicCast(OSNumber, obj)))
- return isEqualTo(offset);
- else
- return false;
+ OSNumber * offset;
+ if ((offset = OSDynamicCast(OSNumber, obj))) {
+ return isEqualTo(offset);
+ } else {
+ return false;
+ }
}
-bool OSNumber::serialize(OSSerialize *s) const
+bool
+OSNumber::serialize(OSSerialize *s) const
{
- char temp[32];
-
- if (s->previouslySerialized(this)) return true;
+ char temp[32];
- sprintf(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),
- (unsigned long)(value & 0xFFFFFFFF));
- } else {
- sprintf(temp, "0x%lx", (unsigned long)value);
- }
- if (!s->addString(temp)) return false;
+ if (s->previouslySerialized(this)) {
+ return true;
+ }
- return s->addXMLEndTag("integer");
+ snprintf(temp, sizeof(temp), "integer size=\"%d\"", size);
+ if (!s->addXMLStartTag(this, temp)) {
+ return false;
+ }
+
+ //XXX sprintf(temp, "0x%qx", value);
+ if ((value >> 32)) {
+ snprintf(temp, sizeof(temp), "0x%lx%08lx", (unsigned long)(value >> 32),
+ (unsigned long)(value & 0xFFFFFFFF));
+ } else {
+ snprintf(temp, sizeof(temp), "0x%lx", (unsigned long)value);
+ }
+ if (!s->addString(temp)) {
+ return false;
+ }
+
+ return s->addXMLEndTag("integer");
}