xnu-344.23.tar.gz

[apple/xnu.git] / libkern / c++ / OSData.cpp

diff --git a/libkern/c++/OSData.cpp b/libkern/c++/OSData.cpp
index 6c5078a1dcf088dcc52c939f8114f75dd44b5c14..d4f12fea6c5c0b6625176a198b2d42a2f4ea2500 100644 (file)
--- a/libkern/c++/OSData.cpp
+++ b/libkern/c++/OSData.cpp
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * 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@
  */
@@ -47,7 +44,9 @@ OSMetaClassDefineReservedUnused(OSData, 7);
 #define EXTERNAL ((unsigned int) -1)
 
 #if OSALLOCDEBUG
-extern int debug_container_malloc_size;
+extern "C" {
+    extern int debug_container_malloc_size;
+};
 #define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
 #else
 #define ACCUMSIZE(s)
@@ -58,26 +57,19 @@ bool OSData::initWithCapacity(unsigned int inCapacity)
     if (!super::init())
         return false;
 
-    if (data && (!inCapacity || capacity < inCapacity) ) {
-        // clean out old data's storage if it isn't big enough
-        kfree((vm_address_t) data, capacity);
-        data = 0;
-        ACCUMSIZE(-capacity);
-    }
-
-    if (inCapacity && !data) {
+    if(inCapacity) {
         data = (void *) kalloc(inCapacity);
         if (!data)
             return false;
-        capacity = inCapacity;
-        ACCUMSIZE(inCapacity);
     }
 
     length = 0;
-    if (inCapacity < 16)
+    capacity = inCapacity;
+    capacityIncrement = capacity;
+    if(!capacityIncrement)
         capacityIncrement = 16;
-    else
-        capacityIncrement = inCapacity;
+
+    ACCUMSIZE(capacity);
 
     return true;
 }
@@ -87,8 +79,7 @@ bool OSData::initWithBytes(const void *bytes, unsigned int inLength)
     if ((inLength && !bytes) || !initWithCapacity(inLength))
         return false;
 
-    if (bytes != data)
-       bcopy(bytes, data, inLength);
+    bcopy(bytes, data, inLength);
     length = inLength;
 
     return true;
@@ -127,7 +118,7 @@ OSData *OSData::withCapacity(unsigned int inCapacity)
     OSData *me = new OSData;
 
     if (me && !me->initWithCapacity(inCapacity)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -139,7 +130,7 @@ OSData *OSData::withBytes(const void *bytes, unsigned int inLength)
     OSData *me = new OSData;
 
     if (me && !me->initWithBytes(bytes, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
     return me;
@@ -150,7 +141,7 @@ OSData *OSData::withBytesNoCopy(void *bytes, unsigned int inLength)
     OSData *me = new OSData;
 
     if (me && !me->initWithBytesNoCopy(bytes, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -162,7 +153,7 @@ OSData *OSData::withData(const OSData *inData)
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -175,7 +166,7 @@ OSData *OSData::withData(const OSData *inData,
     OSData *me = new OSData;
 
     if (me && !me->initWithData(inData, start, inLength)) {
-        me->release();
+        me->free();
         return 0;
     }
 
@@ -234,7 +225,7 @@ bool OSData::appendBytes(const void *bytes, unsigned int inLength)
 {
     unsigned int newSize;
 
-    if (!inLength)
+    if (inLength == 0)
         return true;
 
     if (capacity == EXTERNAL)
@@ -244,11 +235,7 @@ bool OSData::appendBytes(const void *bytes, unsigned int inLength)
     if ( (newSize > capacity) && newSize > ensureCapacity(newSize) )
         return false;
 
-    if (bytes)
-        bcopy(bytes, &((unsigned char *)data)[length], inLength);
-    else
-        bzero(&((unsigned char *)data)[length], inLength);
-
+    bcopy(bytes, &((unsigned char *)data)[length], inLength);
     length = newSize;
 
     return true;
@@ -258,7 +245,7 @@ bool OSData::appendByte(unsigned char byte, unsigned int inLength)
 {
     unsigned int newSize;
 
-    if (!inLength)
+    if (inLength == 0)
         return true;
 
     if (capacity == EXTERNAL)
@@ -281,7 +268,7 @@ bool OSData::appendBytes(const OSData *other)
 
 const void *OSData::getBytesNoCopy() const
 {
-    if (!length)
+    if (length == 0)
         return 0;
     else
         return data;
@@ -336,7 +323,7 @@ bool OSData::isEqualTo(const OSString *obj) const
     unsigned int checkLen = length;
     unsigned int stringLen;
 
-    if (!obj)
+    if (NULL == obj)
       return false;
 
     stringLen = obj->getLength ();