--- Gnu-Mach/ddb/db_output.c	2020/09/02 04:43:15	1.1.1.2
+++ Gnu-Mach/ddb/db_output.c	2020/09/02 04:48:17	1.1.1.4
@@ -28,18 +28,21 @@
  *	Date:	7/90
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
 /*
  * Printf and character output for debugger.
  */
 
+#include <kern/printf.h>
 #include <stdarg.h>
 #include <mach/boolean.h>
 #include <machine/db_machdep.h>
+#include <device/cons.h>
+#include <ddb/db_command.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_output.h>
+#include <ddb/db_input.h>
 
 /*
  *	Character output - tracks position in line.
@@ -72,15 +75,13 @@ int	db_tab_stop_width = 8;		/* how wide
 int	db_max_line = DB_MAX_LINE;	/* output max lines */
 int	db_max_width = DB_MAX_WIDTH;	/* output line width */
 
-extern void	db_check_interrupt();
-
 /*
  * Force pending whitespace.
  */
 void
-db_force_whitespace()
+db_force_whitespace(void)
 {
-	register int last_print, next_tab;
+	int last_print, next_tab;
 
 	last_print = db_last_non_space;
 	while (last_print < db_output_position) {
@@ -98,9 +99,9 @@ db_force_whitespace()
 }
 
 static void
-db_more()
+db_more(void)
 {
-	register  char *p;
+	char *p;
 	boolean_t quit_output = FALSE;
 
 	for (p = "--db_more--"; *p; p++)
@@ -131,8 +132,7 @@ db_more()
  * Output character.  Buffer whitespace.
  */
 void
-db_putchar(c)
-	int	c;		/* character to output */
+db_putchar(int c)		/* character to output */
 {
 	if (db_max_line >= DB_MIN_MAX_LINE && db_output_line >= db_max_line-1)
 	    db_more();
@@ -187,8 +187,8 @@ db_id_putc(char c, vm_offset_t dummy)
 /*
  * Return output position
  */
-int
-db_print_position()
+int __attribute__ ((pure))
+db_print_position(void)
 {
 	return (db_output_position);
 }
@@ -196,40 +196,20 @@ db_print_position()
 /*
  * End line if too long.
  */
-void db_end_line()
+void db_end_line(void)
 {
 	if (db_output_position >= db_max_width-1)
 	    db_printf("\n");
 }
 
-/*
- * Printing
- */
-extern void	_doprnt();
-
 /*VARARGS1*/
 void
 db_printf(const char *fmt, ...)
 {
 	va_list	listp;
 
-#ifdef	db_printf_enter
-	db_printf_enter();	/* optional multiP serialization */
-#endif
-	va_start(listp, fmt);
-	_doprnt(fmt, &listp, db_id_putc, db_radix, 0);
-	va_end(listp);
-}
-
-/* alternate name */
-
-/*VARARGS1*/
-void
-kdbprintf(const char *fmt, ...)
-{
-	va_list	listp;
 	va_start(listp, fmt);
-	_doprnt(fmt, &listp, db_id_putc, db_radix, 0);
+	_doprnt(fmt, listp, db_id_putc, db_radix, 0);
 	va_end(listp);
 }