--- Gnu-Mach/ddb/db_break.c	2020/09/02 04:43:17	1.1.1.2
+++ Gnu-Mach/ddb/db_break.c	2020/09/02 04:45:49	1.1.1.3
@@ -27,7 +27,7 @@
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
-#include "mach_kdb.h"
+
 #if MACH_KDB
 
 
@@ -43,6 +43,10 @@
 #include <ddb/db_variables.h>
 #include <ddb/db_command.h>
 #include <ddb/db_task_thread.h>
+#include <ddb/db_output.h>
+#include <ddb/db_cond.h>
+#include <ddb/db_expr.h>
+#include <ddb/db_access.h>
 
 #define	NBREAKPOINTS	100
 #define NTHREAD_LIST	(NBREAKPOINTS*3)
@@ -122,7 +126,6 @@ db_delete_thread_breakpoint(bkpt, task_t
 {
 	register db_thread_breakpoint_t tp;
 	register db_thread_breakpoint_t *tpp;
-	void	 db_cond_free();
 
 	if (task_thd == 0) {
 	    /* delete all the thread-breakpoints */
@@ -262,7 +265,7 @@ db_check_breakpoint_valid()
 	}
 }
 
-void
+db_breakpoint_t
 db_set_breakpoint(task, addr, count, thread, task_bpt)
 	task_t		task;
 	db_addr_t	addr;
@@ -279,17 +282,17 @@ db_set_breakpoint(task, addr, count, thr
 	    if (thread == THREAD_NULL
 		|| db_find_thread_breakpoint(bkpt, thread)) {
 		db_printf("Already set.\n");
-		return;
+		return NULL;
 	    }
 	} else {
 	    if (!DB_CHECK_ACCESS(addr, BKPT_SIZE, task)) {
 		db_printf("Cannot set break point at %X\n", addr);
-		return;
+		return NULL;
 	    }
 	    alloc_bkpt = bkpt = db_breakpoint_alloc();
 	    if (bkpt == 0) {
 		db_printf("Too many breakpoints.\n");
-		return;
+		return NULL;
 	    }
 	    bkpt->task = task;
 	    bkpt->flags = (task && thread == THREAD_NULL)?
@@ -304,12 +307,14 @@ db_set_breakpoint(task, addr, count, thr
 	    if (alloc_bkpt)
 		db_breakpoint_free(alloc_bkpt);
 	    db_printf("Too many thread_breakpoints.\n");
+	    return NULL;
 	} else {
 	    db_printf("set breakpoint #%d\n", db_breakpoint_number);
 	    if (alloc_bkpt) {
 		bkpt->link = db_breakpoint_list;
 		db_breakpoint_list = bkpt;
 	    }
+	    return bkpt;
 	}
 }
 
@@ -382,7 +387,7 @@ db_find_breakpoint_here(task, addr)
 boolean_t	db_breakpoints_inserted = TRUE;
 
 void
-db_set_breakpoints()
+db_set_breakpoints(void)
 {
 	register db_breakpoint_t bkpt;
 	register task_t	task;
@@ -427,7 +432,7 @@ db_set_breakpoints()
 }
 
 void
-db_clear_breakpoints()
+db_clear_breakpoints(void)
 {
 	register db_breakpoint_t bkpt, *bkptp;
 	register task_t	task;
@@ -594,7 +599,7 @@ db_list_breakpoints()
 void
 db_delete_cmd()
 {
-	register n;
+	register int n;
 	thread_t thread;
 	vm_offset_t task_thd;
 	boolean_t user_global = FALSE;
@@ -677,7 +682,7 @@ db_breakpoint_cmd(addr, have_addr, count
 	db_expr_t	count;
 	char *		modif;
 {
-	register n;
+	register int n;
 	thread_t thread;
 	boolean_t user_global = db_option(modif, 'U');
 	boolean_t task_bpt = db_option(modif, 'T');