xnu-1456.1.26.tar.gz

[apple/xnu.git] / osfmk / ddb / db_output.c

diff --git a/osfmk/ddb/db_output.c b/osfmk/ddb/db_output.c
index c58db34d786c293a98854da07fb37c0bd6228f25..69bfeeaef7d18043ef7e25ef8eca5dba659e24e8 100644 (file)
--- a/osfmk/ddb/db_output.c
+++ b/osfmk/ddb/db_output.c
@@ -1,14 +1,19 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 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@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -142,7 +147,7 @@ db_reset_more()
 static void
 db_more(void)
 {
 static void
 db_more(void)
 {

-       register  char *p;
+       const char *p;

        boolean_t quit_output = FALSE;
 
        for (p = "--db_more--"; *p; p++)
        boolean_t quit_output = FALSE;
 
        for (p = "--db_more--"; *p; p++)


@@ -287,7 +292,7 @@ db_printf(const char *fmt, ...)
        va_list listp;
 
        va_start(listp, fmt);
        va_list listp;
 
        va_start(listp, fmt);

-       _doprnt(fmt, &listp, db_putchar, db_radix);
+       _doprnt(fmt, &listp, db_putchar, (int)db_radix);

        va_end(listp);
 }
 
        va_end(listp);
 }
 


@@ -299,7 +304,7 @@ kdbprintf(const char *fmt, ...)
        va_list listp;
 
        va_start(listp, fmt);
        va_list listp;
 
        va_start(listp, fmt);

-       _doprnt(fmt, &listp, db_putchar, db_radix);
+       _doprnt(fmt, &listp, db_putchar, (int)db_radix);

        va_end(listp);
 }
 
        va_end(listp);
 }
 


@@ -326,7 +331,7 @@ iprintf(const char *fmt, ...)
        }
 
        va_start(listp, fmt);
        }
 
        va_start(listp, fmt);

-       _doprnt(fmt, &listp, db_putchar, db_radix);
+       _doprnt(fmt, &listp, db_putchar, (int)db_radix);

        va_end(listp);
 }
 
        va_end(listp);
 }