convert K&R into ansi

Message-Id: <Y7GBQ5bk6ZQqtfda@falom>

13 files changed, 191 insertions, 226 deletions

diff --git a/ddb/db_aout.c b/ddb/db_aout.c
index d3f2e31e..8f344d6d 100644
--- a/ddb/db_aout.c
+++ b/ddb/db_aout.c
@@ -133,8 +133,7 @@ aout_db_sym_init(
  * check file name or not (check xxxx.x pattern)
  */
 private boolean_t __attribute__ ((pure))
-aout_db_is_filename(name)
-	const char *name;
+aout_db_is_filename(const char *name)
 {
 	while (*name) {
 	    if (*name == '.') {
@@ -150,9 +149,7 @@ aout_db_is_filename(name)
  * special name comparison routine with a name in the symbol table entry
  */
 private boolean_t __attribute__ ((pure))
-aout_db_eq_name(sp, name)
-	const struct nlist *sp;
-	const char *name;
+aout_db_eq_name(const struct nlist *sp, const char * name)
 {
 	const char *s1, *s2;
 
@@ -185,12 +182,12 @@ aout_db_eq_name(sp, name)
  *	fp(in,out): last found text file name symbol entry
  */
 private struct nlist *
-aout_db_search_name(sp, ep, name, type, fp)
-	struct nlist 		*sp;
-	const struct nlist	*ep;
-	const char		*name;
-	int 			type;
-	struct nlist		**fp;
+aout_db_search_name(
+	struct nlist 		*sp,
+	const struct nlist	*ep,
+	const char		*name,
+	int 			type,
+	struct nlist		**fp)
 {
 	struct nlist	*file_sp = *fp;
 	struct nlist	*found_sp = 0;
@@ -231,11 +228,11 @@ aout_db_search_name(sp, ep, name, type, fp)
  * search a symbol with file, func and line qualification
  */
 private db_sym_t
-aout_db_qualified_search(stab, file, sym, line)
-	db_symtab_t	*stab;
-	const char	*file;
-	const char	*sym;
-	int 		line;
+aout_db_qualified_search(
+	db_symtab_t	*stab,
+	const char	*file,
+	const char	*sym,
+	int 		line)
 {
 	struct nlist *sp = (struct nlist *)stab->start;
 	struct nlist	*ep = (struct nlist *)stab->end;
@@ -395,13 +392,13 @@ aout_db_symbol_values(
  * search symbol by value
  */
 private boolean_t
-aout_db_search_by_addr(stab, addr, file, func, line, diff)
-	const db_symtab_t	*stab;
-	vm_offset_t 		addr;
-	char			**file;
-	char			**func;
-	int 	 		*line;
-	unsigned long		*diff;
+aout_db_search_by_addr(
+	const db_symtab_t	*stab,
+	vm_offset_t 		addr,
+	char			**file,
+	char			**func,
+	int 	 		*line,
+	unsigned long		*diff)
 {
 	struct nlist 	*sp;
 	struct nlist 	*line_sp, *func_sp, *file_sp, *line_func;
@@ -488,12 +485,12 @@ aout_db_search_by_addr(stab, addr, file, func, line, diff)
  * Find filename and lineno within, given the current pc.
  */
 boolean_t
-aout_db_line_at_pc(stab, sym, file, line, pc)
-	db_symtab_t	*stab;
-	db_sym_t	sym;
-	char		**file;
-	int		*line;
-	db_addr_t	pc;
+aout_db_line_at_pc(
+	db_symtab_t	*stab,
+	db_sym_t	sym,
+	char		**file,
+	int		*line,
+	db_addr_t	pc)
 {
 	char		*func;
 	unsigned long	diff;
diff --git a/ddb/db_break.c b/ddb/db_break.c
index c0962161..0456f5f9 100644
--- a/ddb/db_break.c
+++ b/ddb/db_break.c
@@ -81,19 +81,18 @@ db_breakpoint_alloc()
 }
 
 static void
-db_breakpoint_free(bkpt)
-	db_breakpoint_t	bkpt;
+db_breakpoint_free(db_breakpoint_t bkpt)
 {
 	bkpt->link = db_free_breakpoints;
 	db_free_breakpoints = bkpt;
 }
 
 static int
-db_add_thread_breakpoint(bkpt, task_thd, count, task_bpt)
-	const db_breakpoint_t bkpt;
-	vm_offset_t task_thd;
-	int count;
-	boolean_t task_bpt;
+db_add_thread_breakpoint(
+	const db_breakpoint_t bkpt,
+	vm_offset_t task_thd,
+	int count,
+	boolean_t task_bpt)
 {
 	db_thread_breakpoint_t tp;
 
@@ -155,9 +154,9 @@ db_delete_thread_breakpoint(
 }
 
 static db_thread_breakpoint_t __attribute__ ((pure))
-db_find_thread_breakpoint(bkpt, thread)
-	const db_breakpoint_t bkpt;
-	const thread_t thread;
+db_find_thread_breakpoint(
+	const db_breakpoint_t bkpt,
+	const thread_t thread)
 {
 	db_thread_breakpoint_t tp;
 	task_t task = (thread == THREAD_NULL)? TASK_NULL: thread->task;
@@ -175,9 +174,9 @@ db_find_thread_breakpoint(bkpt, thread)
 }
 
 db_thread_breakpoint_t
-db_find_thread_breakpoint_here(task, addr)
-	const task_t	task;
-	db_addr_t	addr;
+db_find_thread_breakpoint_here(
+	const task_t	task,
+	db_addr_t	addr)
 {
 	db_breakpoint_t bkpt;
 
@@ -267,12 +266,12 @@ db_check_breakpoint_valid(void)
 }
 
 db_breakpoint_t
-db_set_breakpoint(task, addr, count, thread, task_bpt)
-	const task_t	task;
-	db_addr_t	addr;
-	int		count;
-	const thread_t	thread;
-	boolean_t	task_bpt;
+db_set_breakpoint(
+	const task_t	task,
+	db_addr_t	addr,
+	int		count,
+	const thread_t	thread,
+	boolean_t	task_bpt)
 {
 	db_breakpoint_t bkpt;
 	db_breakpoint_t alloc_bkpt = 0;
@@ -320,10 +319,10 @@ db_set_breakpoint(task, addr, count, thread, task_bpt)
 }
 
 static void
-db_delete_breakpoint(task, addr, task_thd)
-	const task_t	task;
-	db_addr_t	addr;
-	vm_offset_t	task_thd;
+db_delete_breakpoint(
+	const task_t	task,
+	db_addr_t	addr,
+	vm_offset_t	task_thd)
 {
 	db_breakpoint_t	bkpt;
 	db_breakpoint_t	*prev;
@@ -351,9 +350,9 @@ db_delete_breakpoint(task, addr, task_thd)
 }
 
 db_breakpoint_t __attribute__ ((pure))
-db_find_breakpoint(task, addr)
-	const task_t	task;
-	db_addr_t	addr;
+db_find_breakpoint(
+	const task_t	task,
+	db_addr_t	addr)
 {
 	db_breakpoint_t	bkpt;
 
@@ -367,9 +366,9 @@ db_find_breakpoint(task, addr)
 }
 
 boolean_t
-db_find_breakpoint_here(task, addr)
-	const task_t	task;
-	db_addr_t	addr;
+db_find_breakpoint_here(
+	const task_t	task,
+	db_addr_t	addr)
 {
 	db_breakpoint_t	bkpt;
 
@@ -677,11 +676,11 @@ db_delete_cmd(void)
 /* Set breakpoint with skip count */
 /*ARGSUSED*/
 void
-db_breakpoint_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_breakpoint_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	int n;
 	thread_t thread;
diff --git a/ddb/db_command.c b/ddb/db_command.c
index 57200fe3..c9e4f6ae 100644
--- a/ddb/db_command.c
+++ b/ddb/db_command.c
@@ -97,10 +97,10 @@ boolean_t	db_ed_style = TRUE;
  * Search for command prefix.
  */
 static int
-db_cmd_search(name, table, cmdp)
-	const char *		name;
-	const struct db_command	*table;
-	const struct db_command	**cmdp;	/* out */
+db_cmd_search(
+	const char *		name,
+	const struct db_command	*table,
+	const struct db_command	**cmdp	/* out */)
 {
 	const struct db_command	*cmd;
 	int		result = CMD_NONE;
@@ -144,8 +144,7 @@ db_cmd_search(name, table, cmdp)
 }
 
 static void
-db_cmd_list(table)
-	const struct db_command *table;
+db_cmd_list(const struct db_command *table)
 {
 	const struct db_command *cmd;
 
@@ -470,8 +469,7 @@ db_exec_cmd_nest(
 	return(db_cmd_loop_done == FALSE);
 }
 
-void db_error(s)
-	const char *s;
+void db_error(const char *s)
 {
 	extern int db_macro_level;
 
@@ -547,9 +545,9 @@ db_fncall(void)
 }
 
 boolean_t __attribute__ ((pure))
-db_option(modif, option)
-	const char	*modif;
-	int		option;
+db_option(
+	const char	*modif,
+	int		option)
 {
 	const char *p;
 
diff --git a/ddb/db_examine.c b/ddb/db_examine.c
index 6509a538..75bc1834 100644
--- a/ddb/db_examine.c
+++ b/ddb/db_examine.c
@@ -58,11 +58,11 @@ thread_t	db_examine_thread = THREAD_NULL;
  */
 /*ARGSUSED*/
 void
-db_examine_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_examine_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	thread_t	thread;
 
@@ -90,11 +90,11 @@ db_examine_cmd(addr, have_addr, count, modif)
 
 /* ARGSUSED */
 void
-db_examine_forward(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_examine_forward(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	db_examine(db_next, db_examine_format, db_examine_count,
 				db_thread_to_task(db_examine_thread));
@@ -102,11 +102,11 @@ db_examine_forward(addr, have_addr, count, modif)
 
 /* ARGSUSED */
 void
-db_examine_backward(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_examine_backward(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 
 	db_examine(db_examine_prev_addr - (db_next - db_examine_prev_addr),
@@ -115,11 +115,11 @@ db_examine_backward(addr, have_addr, count, modif)
 }
 
 void
-db_examine(addr, fmt, count, task)
-	db_addr_t	addr;
-	const char *	fmt;	/* format string */
-	int		count;	/* repeat count */
-	task_t		task;
+db_examine(
+	db_addr_t	addr,
+	const char *	fmt,	/* format string */
+	int		count,	/* repeat count */
+	task_t		task)
 {
 	int		c;
 	db_expr_t	value;
@@ -335,9 +335,7 @@ db_print_loc_and_inst(
 }
 
 void
-db_strcpy(dst, src)
-	char *dst;
-	const char *src;
+db_strcpy(char *dst, const char *src)
 {
 	while ((*dst++ = *src++))
 	    ;
diff --git a/ddb/db_lex.c b/ddb/db_lex.c
index 8ab69106..49063e1b 100644
--- a/ddb/db_lex.c
+++ b/ddb/db_lex.c
@@ -49,8 +49,7 @@ int	db_look_char = 0;
 db_expr_t db_look_token = 0;
 
 int
-db_read_line(repeat_last)
-	const char	*repeat_last;
+db_read_line(const char	*repeat_last)
 {
 	int	i;
 
@@ -103,8 +102,7 @@ db_save_lex_context(struct db_lex_context *lp)
 }
 
 void
-db_restore_lex_context(lp)
-	const struct db_lex_context *lp;
+db_restore_lex_context(const struct db_lex_context *lp)
 {
 	db_lp = lp->l_ptr;
 	db_last_lp = db_lp;
diff --git a/ddb/db_macro.c b/ddb/db_macro.c
index 307b7c59..2a28a442 100644
--- a/ddb/db_macro.c
+++ b/ddb/db_macro.c
@@ -58,8 +58,7 @@ int		db_macro_level = 0;
 db_expr_t	db_macro_args[DB_MACRO_LEVEL][DB_NARGS];
 
 static struct db_user_macro *
-db_lookup_macro(name)
-	const char *name;
+db_lookup_macro(const char *name)
 {
 	struct db_user_macro *mp;
 
@@ -140,8 +139,7 @@ db_show_macro(void)
 }
 
 int
-db_exec_macro(name)
-	const char *name;
+db_exec_macro(const char *name)
 {
 	struct db_user_macro *mp;
 	int n;
diff --git a/ddb/db_print.c b/ddb/db_print.c
index 6c2ea238..0781b836 100644
--- a/ddb/db_print.c
+++ b/ddb/db_print.c
@@ -128,9 +128,9 @@ db_show_regs(
 #endif
 
 static char *
-db_thread_stat(thread, status)
-	const thread_t 	thread;
-	char	 	*status;
+db_thread_stat(
+	const thread_t 	thread,
+	char	 	*status)
 {
 	char *p = status;
 
@@ -331,11 +331,11 @@ db_show_all_tasks(db_expr_t addr,
 
 /*ARGSUSED*/
 void
-db_show_all_threads(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	boolean_t	have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_show_all_threads(
+	db_expr_t	addr,
+	boolean_t	have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	task_t task;
 	int task_id;
@@ -384,11 +384,11 @@ db_task_from_space(
 
 /*ARGSUSED*/
 void
-db_show_one_thread(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	boolean_t	have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_show_one_thread(
+	db_expr_t	addr,
+	boolean_t	have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	int		flag;
 	int		thread_id;
@@ -432,11 +432,11 @@ db_show_one_thread(addr, have_addr, count, modif)
 
 /*ARGSUSED*/
 void
-db_show_one_task(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	boolean_t	have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_show_one_task(
+	db_expr_t	addr,
+	boolean_t	have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	int		flag;
 	int		task_id;
@@ -467,9 +467,7 @@ db_show_one_task(addr, have_addr, count, modif)
 }
 
 static int
-db_port_iterate(thread, func)
-	const thread_t thread;
-	void (*func)();
+db_port_iterate(const thread_t thread, void (*func)())
 {
 	ipc_entry_t entry;
 	int n = 0;
@@ -500,11 +498,7 @@ db_lookup_port(
 }
 
 static void
-db_print_port_id(id, port, bits, n)
-	int id;
-	const ipc_port_t port;
-	unsigned bits;
-	int n;
+db_print_port_id(int id, const ipc_port_t port, unsigned bits, int n)
 {
 	if (n != 0 && n % 3 == 0)
 	    db_printf("\n");
@@ -530,11 +524,11 @@ db_print_port_id_long(
 
 /* ARGSUSED */
 void
-db_show_port_id(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	boolean_t	have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_show_port_id(
+	db_expr_t	addr,
+	boolean_t	have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	thread_t thread;
 
diff --git a/ddb/db_run.c b/ddb/db_run.c
index 9b467fc4..0c8c12f4 100644
--- a/ddb/db_run.c
+++ b/ddb/db_run.c
@@ -250,9 +250,7 @@ db_breakpoint_t	db_not_taken_bkpt = 0;
 db_breakpoint_t	db_taken_bkpt = 0;
 
 db_breakpoint_t __attribute__ ((pure))
-db_find_temp_breakpoint(task, addr)
-	const task_t	task;
-	db_addr_t	addr;
+db_find_temp_breakpoint(const task_t task, db_addr_t addr)
 {
 	if (db_taken_bkpt && (db_taken_bkpt->address == addr) &&
 	    db_taken_bkpt->task == task)
@@ -309,9 +307,7 @@ db_set_task_single_step(
 }
 
 void
-db_clear_task_single_step(regs, task)
-	const db_regs_t *regs;
-	task_t	  	task;
+db_clear_task_single_step(const db_regs_t *regs, task_t task)
 {
 	if (db_taken_bkpt != 0) {
 	    db_delete_temp_breakpoint(task, db_taken_bkpt);
@@ -331,11 +327,11 @@ extern int	db_cmd_loop_done;
 /* single-step */
 /*ARGSUSED*/
 void
-db_single_step_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_single_step_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	boolean_t	print = FALSE;
 
@@ -359,11 +355,11 @@ db_single_step_cmd(addr, have_addr, count, modif)
 /* trace and print until call/return */
 /*ARGSUSED*/
 void
-db_trace_until_call_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_trace_until_call_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	boolean_t	print = FALSE;
 
@@ -382,11 +378,11 @@ db_trace_until_call_cmd(addr, have_addr, count, modif)
 
 /*ARGSUSED*/
 void
-db_trace_until_matching_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_trace_until_matching_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	boolean_t	print = FALSE;
 
@@ -407,11 +403,11 @@ db_trace_until_matching_cmd(addr, have_addr, count, modif)
 /* continue */
 /*ARGSUSED*/
 void
-db_continue_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_continue_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	if (modif[0] == 'c')
 	    db_run_mode = STEP_COUNT;
diff --git a/ddb/db_sym.c b/ddb/db_sym.c
index a6a64eae..e78173c1 100644
--- a/ddb/db_sym.c
+++ b/ddb/db_sym.c
@@ -91,9 +91,7 @@ db_add_symbol_table(
  *  overwritten by each call... but in practice this seems okay.
  */
 static char * __attribute__ ((pure))
-db_qualify(symname, symtabname)
-	const char	*symname;
-	const char	*symtabname;
+db_qualify(const char *symname, const char *symtabname)
 {
 	static char     tmp[256];
 	char		*s;
@@ -443,10 +441,10 @@ db_symbol_values(
 unsigned long	db_maxoff = 0x4000;
 
 void
-db_task_printsym(off, strategy, task)
-	db_addr_t	off;
-	db_strategy_t	strategy;
-	task_t		task;
+db_task_printsym(
+	db_addr_t	off,
+	db_strategy_t	strategy,
+	task_t		task)
 {
 	db_addr_t	d;
 	char 		*filename;
@@ -477,19 +475,19 @@ db_task_printsym(off, strategy, task)
 }
 
 void
-db_printsym(off, strategy)
-	db_expr_t	off;
-	db_strategy_t	strategy;
+db_printsym(
+	db_expr_t	off,
+	db_strategy_t	strategy)
 {
 	db_task_printsym(off, strategy, TASK_NULL);
 }
 
 boolean_t
-db_line_at_pc( sym, filename, linenum, pc)
-	db_sym_t	sym;
-	char		**filename;
-	int		*linenum;
-	db_addr_t	pc;
+db_line_at_pc(
+	db_sym_t	sym,
+	char		**filename,
+	int		*linenum,
+	db_addr_t	pc)
 {
 	return (db_last_symtab) ?
 		X_db_line_at_pc( db_last_symtab, sym, filename, linenum, pc) :
diff --git a/ddb/db_task_thread.c b/ddb/db_task_thread.c
index 93e44c25..fe742c26 100644
--- a/ddb/db_task_thread.c
+++ b/ddb/db_task_thread.c
@@ -51,8 +51,7 @@ thread_t	db_default_thread;	/* default target thread */
  * search valid task queue, and return the queue position as the task id
  */
 int
-db_lookup_task(target_task)
-	const task_t target_task;
+db_lookup_task(const task_t target_task)
 {
 	task_t task;
 	int task_id;
@@ -81,9 +80,7 @@ db_lookup_task(target_task)
  * search thread queue of the task, and return the queue position
  */
 int
-db_lookup_task_thread(task, target_thread)
-	const task_t	 task;
-	const thread_t target_thread;
+db_lookup_task_thread(const task_t task, const thread_t target_thread)
 {
 	thread_t thread;
 	int thread_id;
@@ -105,8 +102,7 @@ db_lookup_task_thread(task, target_thread)
  * as the thread id.
  */
 int
-db_lookup_thread(target_thread)
-	const thread_t target_thread;
+db_lookup_thread(const thread_t target_thread)
 {
 	int thread_id;
 	task_t task;
@@ -138,8 +134,7 @@ db_lookup_thread(target_thread)
  * check the address is a valid thread address
  */
 boolean_t
-db_check_thread_address_valid(thread)
-	const thread_t thread;
+db_check_thread_address_valid(const thread_t thread)
 {
 	if (db_lookup_thread(thread) < 0) {
 	    db_printf("Bad thread address 0x%x\n", thread);
@@ -245,11 +240,11 @@ db_init_default_thread(void)
  */
 /* ARGSUSED */
 void
-db_set_default_thread(vp, valuep, flag, ap)
-	struct db_variable 	*vp;
-	db_expr_t		*valuep;
-	int			flag;
-	db_var_aux_param_t 	ap;
+db_set_default_thread(
+	struct db_variable 	*vp,
+	db_expr_t		*valuep,
+	int			flag,
+	db_var_aux_param_t 	ap)
 {
 	thread_t	thread;
 
diff --git a/ddb/db_variables.c b/ddb/db_variables.c
index 5403cc9a..af982e12 100644
--- a/ddb/db_variables.c
+++ b/ddb/db_variables.c
@@ -71,9 +71,9 @@ struct db_variable db_vars[] = {
 struct db_variable *db_evars = db_vars + sizeof(db_vars)/sizeof(db_vars[0]);
 
 static const char *
-db_get_suffix(suffix, suffix_value)
-	const char	*suffix;
-	short		*suffix_value;
+db_get_suffix(
+	const char	*suffix,
+	short		*suffix_value)
 {
 	int value;
 
@@ -89,10 +89,10 @@ db_get_suffix(suffix, suffix_value)
 }
 
 static boolean_t
-db_cmp_variable_name(vp, name, ap)
-	struct db_variable		*vp;
-	char				*name;
-	const db_var_aux_param_t	ap;
+db_cmp_variable_name(
+	struct db_variable		*vp,
+	char				*name,
+	const db_var_aux_param_t	ap)
 {
 	char *var_np;
 	const char *np;
diff --git a/ddb/db_watch.c b/ddb/db_watch.c
index 5a845eca..6ad820e7 100644
--- a/ddb/db_watch.c
+++ b/ddb/db_watch.c
@@ -84,18 +84,17 @@ db_watchpoint_alloc(void)
 }
 
 static void
-db_watchpoint_free(watch)
-	db_watchpoint_t	watch;
+db_watchpoint_free(db_watchpoint_t watch)
 {
 	watch->link = db_free_watchpoints;
 	db_free_watchpoints = watch;
 }
 
 void
-db_set_watchpoint(task, addr, size)
-	const task_t	task;
-	db_addr_t	addr;
-	vm_size_t	size;
+db_set_watchpoint(
+	const task_t	task,
+	db_addr_t	addr,
+	vm_size_t	size)
 {
 	db_watchpoint_t	watch;
 
@@ -129,9 +128,7 @@ db_set_watchpoint(task, addr, size)
 }
 
 void
-db_delete_watchpoint(task, addr)
-	const task_t	task;
-	db_addr_t	addr;
+db_delete_watchpoint(const task_t task, db_addr_t addr)
 {
 	db_watchpoint_t	watch;
 	db_watchpoint_t	*prev;
@@ -178,10 +175,7 @@ db_list_watchpoints(void)
 }
 
 static int
-db_get_task(modif, taskp, addr)
-	const char	*modif;
-	task_t		*taskp;
-	db_addr_t	addr;
+db_get_task(const char *modif, task_t *taskp, db_addr_t addr)
 {
 	task_t		task = TASK_NULL;
 	db_expr_t	value;
@@ -217,11 +211,11 @@ db_get_task(modif, taskp, addr)
 /* Delete watchpoint */
 /*ARGSUSED*/
 void
-db_deletewatch_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_deletewatch_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	task_t		task;
 
@@ -233,11 +227,11 @@ db_deletewatch_cmd(addr, have_addr, count, modif)
 /* Set watchpoint */
 /*ARGSUSED*/
 void
-db_watchpoint_cmd(addr, have_addr, count, modif)
-	db_expr_t	addr;
-	int		have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_watchpoint_cmd(
+	db_expr_t	addr,
+	int		have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	vm_size_t	size;
 	db_expr_t	value;
diff --git a/ddb/db_write_cmd.c b/ddb/db_write_cmd.c
index 1a1e5fc9..cfc2b703 100644
--- a/ddb/db_write_cmd.c
+++ b/ddb/db_write_cmd.c
@@ -52,11 +52,11 @@
  */
 /*ARGSUSED*/
 void
-db_write_cmd(address, have_addr, count, modif)
-	db_expr_t	address;
-	boolean_t	have_addr;
-	db_expr_t	count;
-	const char *	modif;
+db_write_cmd(
+	db_expr_t	address,
+	boolean_t	have_addr,
+	db_expr_t	count,
+	const char *	modif)
 {
 	db_addr_t	addr;
 	db_expr_t	old_value;