diff options
author | alfred <alfred@FreeBSD.org> | 2002-03-20 05:14:42 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2002-03-20 05:14:42 +0000 |
commit | eddc6122c99ccaa9c147f78f44588a5757d3f046 (patch) | |
tree | 5fcd19c5c990fd9d830071523f9c3dc5cfb35586 /sys/ddb | |
parent | 62379fef927268e564719e3e766bb3900ef387c7 (diff) | |
download | FreeBSD-src-eddc6122c99ccaa9c147f78f44588a5757d3f046.zip FreeBSD-src-eddc6122c99ccaa9c147f78f44588a5757d3f046.tar.gz |
Remove __P.
Diffstat (limited to 'sys/ddb')
-rw-r--r-- | sys/ddb/db_access.h | 5 | ||||
-rw-r--r-- | sys/ddb/db_break.c | 13 | ||||
-rw-r--r-- | sys/ddb/db_break.h | 10 | ||||
-rw-r--r-- | sys/ddb/db_command.c | 16 | ||||
-rw-r--r-- | sys/ddb/db_command.h | 2 | ||||
-rw-r--r-- | sys/ddb/db_examine.c | 4 | ||||
-rw-r--r-- | sys/ddb/db_expr.c | 10 | ||||
-rw-r--r-- | sys/ddb/db_input.c | 10 | ||||
-rw-r--r-- | sys/ddb/db_lex.c | 8 | ||||
-rw-r--r-- | sys/ddb/db_lex.h | 8 | ||||
-rw-r--r-- | sys/ddb/db_output.c | 2 | ||||
-rw-r--r-- | sys/ddb/db_output.h | 6 | ||||
-rw-r--r-- | sys/ddb/db_run.c | 6 | ||||
-rw-r--r-- | sys/ddb/db_sym.c | 9 | ||||
-rw-r--r-- | sys/ddb/db_sym.h | 30 | ||||
-rw-r--r-- | sys/ddb/db_variables.c | 6 | ||||
-rw-r--r-- | sys/ddb/db_variables.h | 5 | ||||
-rw-r--r-- | sys/ddb/db_watch.c | 23 | ||||
-rw-r--r-- | sys/ddb/ddb.h | 48 |
19 files changed, 108 insertions, 113 deletions
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h index 715c1cb..9709c31 100644 --- a/sys/ddb/db_access.h +++ b/sys/ddb/db_access.h @@ -36,8 +36,7 @@ /* * Data access functions for debugger. */ -db_expr_t db_get_value __P((db_addr_t addr, int size, - boolean_t is_signed)); -void db_put_value __P((db_addr_t addr, int size, db_expr_t value)); +db_expr_t db_get_value(db_addr_t addr, int size, boolean_t is_signed); +void db_put_value(db_addr_t addr, int size, db_expr_t value); #endif /* !_DDB_DB_ACCESS_H_ */ diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index d62d8c3..9522f3b 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -49,13 +49,12 @@ static db_breakpoint_t db_next_free_breakpoint = &db_break_table[0]; static db_breakpoint_t db_free_breakpoints = 0; static db_breakpoint_t db_breakpoint_list = 0; -static db_breakpoint_t db_breakpoint_alloc __P((void)); -static void db_breakpoint_free __P((db_breakpoint_t bkpt)); -static void db_delete_breakpoint __P((vm_map_t map, db_addr_t addr)); -static db_breakpoint_t db_find_breakpoint __P((vm_map_t map, db_addr_t addr)); -static void db_list_breakpoints __P((void)); -static void db_set_breakpoint __P((vm_map_t map, db_addr_t addr, - int count)); +static db_breakpoint_t db_breakpoint_alloc(void); +static void db_breakpoint_free(db_breakpoint_t bkpt); +static void db_delete_breakpoint(vm_map_t map, db_addr_t addr); +static db_breakpoint_t db_find_breakpoint(vm_map_t map, db_addr_t addr); +static void db_list_breakpoints(void); +static void db_set_breakpoint(vm_map_t map, db_addr_t addr, int count); static db_breakpoint_t db_breakpoint_alloc() diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h index 88520da..d6ed76e 100644 --- a/sys/ddb/db_break.h +++ b/sys/ddb/db_break.h @@ -54,14 +54,14 @@ struct db_breakpoint { }; typedef struct db_breakpoint *db_breakpoint_t; -void db_clear_breakpoints __P((void)); +void db_clear_breakpoints(void); #ifdef SOFTWARE_SSTEP -void db_delete_temp_breakpoint __P((db_breakpoint_t)); +void db_delete_temp_breakpoint(db_breakpoint_t); #endif -db_breakpoint_t db_find_breakpoint_here __P((db_addr_t addr)); -void db_set_breakpoints __P((void)); +db_breakpoint_t db_find_breakpoint_here(db_addr_t addr); +void db_set_breakpoints(void); #ifdef SOFTWARE_SSTEP -db_breakpoint_t db_set_temp_breakpoint __P((db_addr_t)); +db_breakpoint_t db_set_temp_breakpoint(db_addr_t); #endif #endif /* !_DDB_DB_BREAK_H_ */ diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index d41cf9c..9d3be3b 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -101,17 +101,17 @@ db_skip_to_eol() #define CMD_AMBIGUOUS 3 #define CMD_HELP 4 -static void db_cmd_list __P((struct command *table, +static void db_cmd_list(struct command *table, struct command **aux_tablep, - struct command **aux_tablep_end)); -static int db_cmd_search __P((char *name, struct command *table, + struct command **aux_tablep_end); +static int db_cmd_search(char *name, struct command *table, struct command **aux_tablep, struct command **aux_tablep_end, - struct command **cmdp)); -static void db_command __P((struct command **last_cmdp, + struct command **cmdp); +static void db_command(struct command **last_cmdp, struct command *cmd_table, struct command **aux_cmd_tablep, - struct command **aux_cmd_tablep_end)); + struct command **aux_cmd_tablep_end); /* * Search for command prefix. @@ -503,10 +503,10 @@ db_fncall(dummy1, dummy2, dummy3, dummy4) db_expr_t args[MAXARGS]; int nargs = 0; db_expr_t retval; - typedef db_expr_t fcn_10args_t __P((db_expr_t, db_expr_t, db_expr_t, + typedef db_expr_t fcn_10args_t(db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t, - db_expr_t)); + db_expr_t); fcn_10args_t *func; int t; diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h index a95f5b3..bc5fe6c 100644 --- a/sys/ddb/db_command.h +++ b/sys/ddb/db_command.h @@ -37,7 +37,7 @@ * Command loop declarations. */ -void db_command_loop __P((void)); +void db_command_loop(void); extern db_addr_t db_dot; /* current location */ extern db_addr_t db_last_addr; /* last explicit address typed */ diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c index 87143e1..dd1cadd 100644 --- a/sys/ddb/db_examine.c +++ b/sys/ddb/db_examine.c @@ -44,8 +44,8 @@ static char db_examine_format[TOK_STRING_SIZE] = "x"; -static void db_examine __P((db_addr_t, char *, int)); -static void db_search __P((db_addr_t, int, db_expr_t, db_expr_t, u_int)); +static void db_examine(db_addr_t, char *, int); +static void db_search(db_addr_t, int, db_expr_t, db_expr_t, u_int); /* * Examine (print) data. diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c index 61f7fc1..850121b 100644 --- a/sys/ddb/db_expr.c +++ b/sys/ddb/db_expr.c @@ -37,11 +37,11 @@ #include <ddb/db_access.h> #include <ddb/db_command.h> -static boolean_t db_add_expr __P((db_expr_t *valuep)); -static boolean_t db_mult_expr __P((db_expr_t *valuep)); -static boolean_t db_shift_expr __P((db_expr_t *valuep)); -static boolean_t db_term __P((db_expr_t *valuep)); -static boolean_t db_unary __P((db_expr_t *valuep)); +static boolean_t db_add_expr(db_expr_t *valuep); +static boolean_t db_mult_expr(db_expr_t *valuep); +static boolean_t db_shift_expr(db_expr_t *valuep); +static boolean_t db_term(db_expr_t *valuep); +static boolean_t db_unary(db_expr_t *valuep); static boolean_t db_term(valuep) diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index f433861..bee293f 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -63,11 +63,11 @@ static int db_lhist_nlines; #define BLANK ' ' #define BACKUP '\b' -static int cnmaygetc __P((void)); -static void db_delete __P((int n, int bwd)); -static int db_inputchar __P((int c)); -static void db_putnchars __P((int c, int count)); -static void db_putstring __P((char *s, int count)); +static int cnmaygetc(void); +static void db_delete(int n, int bwd); +static int db_inputchar(int c); +static void db_putnchars(int c, int count); +static void db_putstring(char *s, int count); void db_putstring(s, count) diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c index 123cd3f..63adf2b 100644 --- a/sys/ddb/db_lex.c +++ b/sys/ddb/db_lex.c @@ -41,10 +41,10 @@ static char db_line[120]; static char * db_lp, *db_endlp; -static int db_lex __P((void)); -static void db_flush_line __P((void)); -static int db_read_char __P((void)); -static void db_unread_char __P((int)); +static int db_lex(void); +static void db_flush_line(void); +static int db_read_char(void); +static void db_unread_char(int); int db_read_line() diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h index c4e0ee2..538a866 100644 --- a/sys/ddb/db_lex.h +++ b/sys/ddb/db_lex.h @@ -36,10 +36,10 @@ /* * Lexical analyzer. */ -void db_flush_lex __P((void)); -int db_read_line __P((void)); -int db_read_token __P((void)); -void db_unread_token __P((int t)); +void db_flush_lex(void); +int db_read_line(void); +int db_read_token(void); +void db_unread_token(int t); extern db_expr_t db_tok_number; #define TOK_STRING_SIZE 120 diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index 9192c18..e82eea6 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -63,7 +63,7 @@ db_expr_t db_tab_stop_width = 8; /* how wide are tab stops? */ ((((i) + db_tab_stop_width) / db_tab_stop_width) * db_tab_stop_width) db_expr_t db_max_width = 79; /* output line width */ -static void db_putchar __P((int c, void *arg)); +static void db_putchar(int c, void *arg); /* * Force pending whitespace. diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h index 8172bbb..cca5a897 100644 --- a/sys/ddb/db_output.h +++ b/sys/ddb/db_output.h @@ -38,8 +38,8 @@ * Printing routines for kernel debugger. */ -void db_end_line __P((void)); -void db_force_whitespace __P((void)); -int db_print_position __P((void)); +void db_end_line(void); +void db_force_whitespace(void); +int db_print_position(void); #endif /* !_DDB_DB_OUTPUT_H_ */ diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c index c17d0a4..4b4875f 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -60,14 +60,14 @@ int db_load_count; int db_store_count; #ifndef db_set_single_step -extern void db_set_single_step __P((db_regs_t *regs)); +extern void db_set_single_step(db_regs_t *regs); #endif #ifndef db_clear_single_step -extern void db_clear_single_step __P((db_regs_t *regs)); +extern void db_clear_single_step(db_regs_t *regs); #endif #ifdef notused -static void db_single_step __P((db_regs_t *regs)); +static void db_single_step(db_regs_t *regs); #endif boolean_t diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index 7cba688..08eb1c0 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -48,11 +48,10 @@ static int db_nsymtab = 0; static db_symtab_t *db_last_symtab; /* where last symbol was found */ -static c_db_sym_t db_lookup __P(( const char *symstr)); -static char *db_qualify __P((c_db_sym_t sym, char *symtabname)); -static boolean_t db_symbol_is_ambiguous __P((c_db_sym_t sym)); -static boolean_t db_line_at_pc __P((c_db_sym_t, char **, int *, - db_expr_t)); +static c_db_sym_t db_lookup( const char *symstr); +static char *db_qualify(c_db_sym_t sym, char *symtabname); +static boolean_t db_symbol_is_ambiguous(c_db_sym_t sym); +static boolean_t db_line_at_pc(c_db_sym_t, char **, int *, db_expr_t); /* * Add symbol table, with given name, to list of symbol tables. diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h index e4decf4..6b937c8 100644 --- a/sys/ddb/db_sym.h +++ b/sys/ddb/db_sym.h @@ -69,13 +69,13 @@ typedef int db_strategy_t; /* search strategy */ /* * Functions exported by the symtable module */ -void db_add_symbol_table __P((char *, char *, char *, char *)); +void db_add_symbol_table(char *, char *, char *, char *); /* extend the list of symbol tables */ -c_db_sym_t db_search_symbol __P((db_addr_t, db_strategy_t, db_expr_t *)); +c_db_sym_t db_search_symbol(db_addr_t, db_strategy_t, db_expr_t *); /* find symbol given value */ -void db_symbol_values __P((c_db_sym_t, const char **, db_expr_t *)); +void db_symbol_values(c_db_sym_t, const char **, db_expr_t *); /* return name and value of symbol */ #define db_find_sym_and_offset(val,namep,offp) \ @@ -86,25 +86,25 @@ void db_symbol_values __P((c_db_sym_t, const char **, db_expr_t *)); db_symbol_values(db_search_symbol(val,DB_STGY_XTRN,offp),namep,0) /* ditto, but no locals */ -int db_eqname __P((const char *, const char *, int)); +int db_eqname(const char *, const char *, int); /* strcmp, modulo leading char */ -void db_printsym __P((db_expr_t, db_strategy_t)); +void db_printsym(db_expr_t, db_strategy_t); /* print closest symbol to a value */ -int db_sym_numargs __P((c_db_sym_t, int *, char **)); +int db_sym_numargs(c_db_sym_t, int *, char **); -boolean_t X_db_line_at_pc __P((db_symtab_t *symtab, c_db_sym_t cursym, +boolean_t X_db_line_at_pc(db_symtab_t *symtab, c_db_sym_t cursym, char **filename, int *linenum, - db_expr_t off)); -c_db_sym_t X_db_lookup __P((db_symtab_t *stab, const char *symstr)); -c_db_sym_t X_db_search_symbol __P((db_symtab_t *symtab, db_addr_t off, + db_expr_t off); +c_db_sym_t X_db_lookup(db_symtab_t *stab, const char *symstr); +c_db_sym_t X_db_search_symbol(db_symtab_t *symtab, db_addr_t off, db_strategy_t strategy, - db_expr_t *diffp)); -int X_db_sym_numargs __P((db_symtab_t *, c_db_sym_t, int *, - char **)); -void X_db_symbol_values __P((db_symtab_t *symtab, + db_expr_t *diffp); +int X_db_sym_numargs(db_symtab_t *, c_db_sym_t, int *, + char **); +void X_db_symbol_values(db_symtab_t *symtab, c_db_sym_t sym, const char **namep, - db_expr_t *valuep)); + db_expr_t *valuep); #endif /* !_DDB_DB_SYM_H_ */ diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c index 8c0eb98..b985f78 100644 --- a/sys/ddb/db_variables.c +++ b/sys/ddb/db_variables.c @@ -38,11 +38,11 @@ #include <ddb/db_lex.h> #include <ddb/db_variables.h> -static int db_find_variable __P((struct db_variable **varp)); -static void db_write_variable __P((struct db_variable *, db_expr_t *)); +static int db_find_variable(struct db_variable **varp); +static void db_write_variable(struct db_variable *, db_expr_t *); #ifdef notused -static int db_set_variable __P((db_expr_t value)); +static int db_set_variable(db_expr_t value); #endif static struct db_variable db_vars[] = { diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h index f430f0d..6c05118 100644 --- a/sys/ddb/db_variables.h +++ b/sys/ddb/db_variables.h @@ -38,8 +38,7 @@ * Debugger variables. */ struct db_variable; -typedef int db_varfcn_t __P((struct db_variable *vp, db_expr_t *valuep, - int op)); +typedef int db_varfcn_t(struct db_variable *vp, db_expr_t *valuep, int op); struct db_variable { char *name; /* Name of variable */ db_expr_t *valuep; /* value of variable */ @@ -53,6 +52,6 @@ struct db_variable { extern struct db_variable db_regs[]; /* machine registers */ extern struct db_variable *db_eregs; -void db_read_variable __P((struct db_variable *, db_expr_t *)); +void db_read_variable(struct db_variable *, db_expr_t *); #endif /* _!DDB_DB_VARIABLES_H_ */ diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index abfb853..f25b295 100644 --- a/sys/ddb/db_watch.c +++ b/sys/ddb/db_watch.c @@ -55,21 +55,20 @@ static db_watchpoint_t db_next_free_watchpoint = &db_watch_table[0]; static db_watchpoint_t db_free_watchpoints = 0; static db_watchpoint_t db_watchpoint_list = 0; -static db_watchpoint_t db_watchpoint_alloc __P((void)); -static void db_watchpoint_free __P((db_watchpoint_t watch)); -static void db_delete_watchpoint __P((vm_map_t map, - db_addr_t addr)); +static db_watchpoint_t db_watchpoint_alloc(void); +static void db_watchpoint_free(db_watchpoint_t watch); +static void db_delete_watchpoint(vm_map_t map, db_addr_t addr); #ifdef notused -static boolean_t db_find_watchpoint __P((vm_map_t map, db_addr_t addr, - db_regs_t *regs)); +static boolean_t db_find_watchpoint(vm_map_t map, db_addr_t addr, + db_regs_t *regs); #endif -static void db_list_watchpoints __P((void)); -static void db_set_watchpoint __P((vm_map_t map, db_addr_t addr, - vm_size_t size)); +static void db_list_watchpoints(void); +static void db_set_watchpoint(vm_map_t map, db_addr_t addr, + vm_size_t size); -int db_md_set_watchpoint __P((db_expr_t addr, db_expr_t size)); -int db_md_clr_watchpoint __P((db_expr_t addr, db_expr_t size)); -void db_md_list_watchpoints __P((void)); +int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); +int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); +void db_md_list_watchpoints(void); db_watchpoint_t diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h index df602d0..fbaf5e6 100644 --- a/sys/ddb/ddb.h +++ b/sys/ddb/ddb.h @@ -39,8 +39,8 @@ #include <machine/db_machdep.h> /* type definitions */ -typedef void db_cmdfcn_t __P((db_expr_t addr, boolean_t have_addr, - db_expr_t count, char *modif)); +typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, + db_expr_t count, char *modif); #define DB_COMMAND(cmd_name, func_name) \ DB_SET(cmd_name, func_name, db_cmd_set) @@ -79,32 +79,32 @@ extern db_expr_t db_tab_stop_width; struct vm_map; -void db_check_interrupt __P((void)); -void db_clear_watchpoints __P((void)); -db_addr_t db_disasm __P((db_addr_t loc, boolean_t altfmt)); +void db_check_interrupt(void); +void db_clear_watchpoints(void); +db_addr_t db_disasm(db_addr_t loc, boolean_t altfmt); /* instruction disassembler */ -void db_error __P((char *s)); -int db_expression __P((db_expr_t *valuep)); -int db_get_variable __P((db_expr_t *valuep)); -void db_iprintf __P((const char *,...)) __printflike(1, 2); -struct vm_map *db_map_addr __P((vm_offset_t)); -boolean_t db_map_current __P((struct vm_map *)); -boolean_t db_map_equal __P((struct vm_map *, struct vm_map *)); -void db_print_loc_and_inst __P((db_addr_t loc)); -void db_printf __P((const char *fmt, ...)) __printflike(1, 2); -void db_read_bytes __P((vm_offset_t addr, size_t size, char *data)); +void db_error(char *s); +int db_expression(db_expr_t *valuep); +int db_get_variable(db_expr_t *valuep); +void db_iprintf(const char *,...) __printflike(1, 2); +struct vm_map *db_map_addr(vm_offset_t); +boolean_t db_map_current(struct vm_map *); +boolean_t db_map_equal(struct vm_map *, struct vm_map *); +void db_print_loc_and_inst(db_addr_t loc); +void db_printf(const char *fmt, ...) __printflike(1, 2); +void db_read_bytes(vm_offset_t addr, size_t size, char *data); /* machine-dependent */ -int db_readline __P((char *lstart, int lsize)); -void db_restart_at_pc __P((boolean_t watchpt)); -void db_set_watchpoints __P((void)); -void db_skip_to_eol __P((void)); -boolean_t db_stop_at_pc __P((boolean_t *is_breakpoint)); +int db_readline(char *lstart, int lsize); +void db_restart_at_pc(boolean_t watchpt); +void db_set_watchpoints(void); +void db_skip_to_eol(void); +boolean_t db_stop_at_pc(boolean_t *is_breakpoint); #define db_strcpy strcpy -void db_trap __P((int type, int code)); -int db_value_of_name __P((const char *name, db_expr_t *valuep)); -void db_write_bytes __P((vm_offset_t addr, size_t size, char *data)); +void db_trap(int type, int code); +int db_value_of_name(const char *name, db_expr_t *valuep); +void db_write_bytes(vm_offset_t addr, size_t size, char *data); /* machine-dependent */ -void kdb_init __P((void)); +void kdb_init(void); db_cmdfcn_t db_breakpoint_cmd; db_cmdfcn_t db_continue_cmd; |