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 e98eb0757ab6058fda817142b90d6d50bdd71aa9..69bfeeaef7d18043ef7e25ef8eca5dba659e24e8 100644 (file)
--- a/osfmk/ddb/db_output.c
+++ b/osfmk/ddb/db_output.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 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@
  * 
- * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 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_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -82,7 +88,7 @@
  */
 
 #ifndef        DB_MAX_LINE
-#define        DB_MAX_LINE             24      /* maximum line */
+#define        DB_MAX_LINE             43      /* maximum line */
 #define DB_MAX_WIDTH           132     /* maximum width */
 #endif /* DB_MAX_LINE */
 
@@ -141,13 +147,9 @@ db_reset_more()
 static void
 db_more(void)
 {
-       register  char *p;
+       const char *p;
        boolean_t quit_output = FALSE;
 
-#if defined(__alpha)
-       extern boolean_t kdebug_mode;
-       if (kdebug_mode) return;
-#endif /* defined(__alpha) */
        for (p = "--db_more--"; *p; p++)
            cnputc(*p);
        switch(cngetc()) {
@@ -285,27 +287,24 @@ db_end_line(void)
  */
 
 void
-db_printf(char *fmt, ...)
+db_printf(const char *fmt, ...)
 {
        va_list listp;
 
-#ifdef luna88k
-       db_printing();
-#endif
        va_start(listp, fmt);
-       _doprnt(fmt, &listp, db_putchar, db_radix);
+       _doprnt(fmt, &listp, db_putchar, (int)db_radix);
        va_end(listp);
 }
 
 /* alternate name */
 
 void
-kdbprintf(char *fmt, ...)
+kdbprintf(const char *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);
 }
 
@@ -315,7 +314,7 @@ int db_indent = 0;
  * Printing (to console) with indentation.
  */
 void
-iprintf(char *fmt, ...)
+iprintf(const char *fmt, ...)
 {
        va_list listp;
        register int i;
@@ -332,7 +331,7 @@ iprintf(char *fmt, ...)
        }
 
        va_start(listp, fmt);
-       _doprnt(fmt, &listp, db_putchar, db_radix);
+       _doprnt(fmt, &listp, db_putchar, (int)db_radix);
        va_end(listp);
 }
 
@@ -340,9 +339,7 @@ void
 db_output_prompt(void)
 {
        db_printf("db%s", (db_default_act) ? "t": "");
-#if    NCPUS > 1
        db_printf("{%d}", cpu_number());
-#endif
        db_printf("> ");
 }