--- Gnu-Mach/ddb/db_examine.c	2020/09/02 04:43:15	1.1.1.2
+++ Gnu-Mach/ddb/db_examine.c	2020/09/02 04:45:46	1.1.1.3
@@ -27,11 +27,12 @@
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
-#include "mach_kdb.h"
+
 #if MACH_KDB
 
 #include <mach/boolean.h>
 #include <machine/db_machdep.h>
+#include <machine/db_interface.h>
 
 #include <ddb/db_access.h>
 #include <ddb/db_lex.h>
@@ -39,6 +40,8 @@
 #include <ddb/db_command.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_task_thread.h>
+#include <ddb/db_examine.h>
+#include <ddb/db_expr.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <mach/vm_param.h>
@@ -53,9 +56,6 @@ thread_t	db_examine_thread = THREAD_NULL
 extern	db_addr_t db_disasm(db_addr_t pc, boolean_t altform, task_t task);
 			/* instruction disassembler */
 
-void db_examine();/*forwards*/
-void db_strcpy();
-
 /*
  * Examine (print) data.
  */
@@ -340,7 +340,7 @@ db_strcpy(dst, src)
 	register char *dst;
 	register char *src;
 {
-	while (*dst++ = *src++)
+	while ((*dst++ = *src++))
 	    ;
 }
 
@@ -458,7 +458,7 @@ db_xcdump(addr, size, count, task)
 	int		count;
 	task_t		task;
 {
-	register 	i, n;
+	register 	int i, n;
 	db_expr_t	value;
 	int		bcount;
 	db_addr_t	off;
@@ -480,7 +480,7 @@ db_xcdump(addr, size, count, task)
 		if (!DB_CHECK_ACCESS(next_page_addr, sizeof(int), task))
 		    bcount = next_page_addr - addr;
 	    }
-	    db_read_bytes((char *)addr, bcount, data, task);
+	    db_read_bytes(addr, bcount, data, task);
 	    for (i = 0; i < bcount && off != 0; i += size) {
 		if (i % 4 == 0)
 			db_printf(" ");