xnu-792.13.8.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 32d7f4239a3638e1607eef93a89782f72a99c7ad..3ddee874f950e82bc516eebadce80ea5e239d077 100644 (file)
--- a/osfmk/ddb/db_output.c
+++ b/osfmk/ddb/db_output.c
@@ -1,26 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * 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
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ *
+ * 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, 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_LICENSE_OSREFERENCE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -85,7 +90,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 */
 
@@ -147,10 +152,6 @@ db_more(void)
        register  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()) {
@@ -288,13 +289,10 @@ 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);
        va_end(listp);
@@ -303,7 +301,7 @@ db_printf(char *fmt, ...)
 /* alternate name */
 
 void
-kdbprintf(char *fmt, ...)
+kdbprintf(const char *fmt, ...)
 {
        va_list listp;
 
@@ -318,7 +316,7 @@ int db_indent = 0;
  * Printing (to console) with indentation.
  */
 void
-iprintf(char *fmt, ...)
+iprintf(const char *fmt, ...)
 {
        va_list listp;
        register int i;
@@ -343,9 +341,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("> ");
 }