xnu-1228.5.20.tar.gz

[apple/xnu.git] / iokit / Kernel / IOKitDebug.cpp

diff --git a/iokit/Kernel/IOKitDebug.cpp b/iokit/Kernel/IOKitDebug.cpp
index 6676cd6325d7e2aaab2bf31e43ff6b8af33f5962..3a2415196ebfef91f7c89a4aa9dbf3699cd64797 100644 (file)
--- a/iokit/Kernel/IOKitDebug.cpp
+++ b/iokit/Kernel/IOKitDebug.cpp
@@ -1,14 +1,19 @@
 /*
 /*

- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @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
  * 
  * 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.
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
  */
 /*
  * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 


@@ -50,6 +55,7 @@ SYSCTL_QUAD(_debug, OID_AUTO, iokit, CTLFLAG_RW, &gIOKitDebug, "boot_arg io");
 
 int            debug_malloc_size;
 int            debug_iomalloc_size;
 
 int            debug_malloc_size;
 int            debug_iomalloc_size;

+

 vm_size_t      debug_iomallocpageable_size;
 int            debug_container_malloc_size;
 // int                 debug_ivars_size; // in OSObject.cpp
 vm_size_t      debug_iomallocpageable_size;
 int            debug_container_malloc_size;
 // int                 debug_ivars_size; // in OSObject.cpp


@@ -76,7 +82,7 @@ void IOPrintPlane( const IORegistryPlane * plane )
 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {
 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {

-       sprintf( format + 1, "%ds", 2 * next->getDepth( plane ));
+       snprintf(format + 1, sizeof(format) - 1, "%ds", 2 * next->getDepth( plane ));

        IOLog( format, "");
        IOLog( "\033[33m%s", next->getName( plane ));
        if( (next->getLocation( plane )))
        IOLog( format, "");
        IOLog( "\033[33m%s", next->getName( plane ));
        if( (next->getLocation( plane )))


@@ -132,7 +138,7 @@ void db_dumpiojunk( const IORegistryPlane * plane )
 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {
 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {

-               sprintf( format + 1, "%ds", 2 * next->getDepth( plane ));
+               snprintf(format + 1, sizeof(format) - 1, "%ds", 2 * next->getDepth( plane ));

                dbugprintf( format, "");
                dbugprintf( "%s", next->getName( plane ));
                if( (next->getLocation( plane )))
                dbugprintf( format, "");
                dbugprintf( "%s", next->getName( plane ));
                if( (next->getLocation( plane )))


@@ -198,7 +204,6 @@ void IOKitDiagnostics::updateOffset( OSDictionary * dict,
     off->release();
 }
 
     off->release();
 }
 

-

 bool IOKitDiagnostics::serialize(OSSerialize *s) const
 {
     OSDictionary *     dict;
 bool IOKitDiagnostics::serialize(OSSerialize *s) const
 {
     OSDictionary *     dict;