From feb494d76a34e3ccf614ceccd68d6ce7b2f1cbd8 Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Sun, 30 Jul 2000 01:48:28 +0000 Subject: Protoization. --- gdb/inftarg.c | 149 ++++++++++++++++++---------------------------------------- 1 file changed, 45 insertions(+), 104 deletions(-) (limited to 'gdb/inftarg.c') diff --git a/gdb/inftarg.c b/gdb/inftarg.c index 53c53e4f5a7..90762f867a1 100644 --- a/gdb/inftarg.c +++ b/gdb/inftarg.c @@ -116,9 +116,7 @@ int not_same_real_pid = 1; of error; store status through argument pointer OURSTATUS. */ static int -child_wait (pid, ourstatus) - int pid; - struct target_waitstatus *ourstatus; +child_wait (int pid, struct target_waitstatus *ourstatus) { int save_errno; int status; @@ -228,9 +226,7 @@ child_wait (pid, ourstatus) #if !defined(CHILD_POST_WAIT) void -child_post_wait (pid, wait_status) - int pid; - int wait_status; +child_post_wait (int pid, int wait_status) { /* This version of Unix doesn't require a meaningful "post wait" operation. @@ -247,8 +243,7 @@ child_post_wait (pid, wait_status) for now we're going to try and be compatable with the old thread code. */ int -child_thread_alive (pid) - int pid; +child_thread_alive (int pid) { return (kill (pid, 0) != -1); } @@ -256,10 +251,7 @@ child_thread_alive (pid) #endif static void -child_attach_to_process (args, from_tty, after_fork) - char *args; - int from_tty; - int after_fork; +child_attach_to_process (char *args, int from_tty, int after_fork) { if (!args) error_no_arg ("process-id to attach"); @@ -312,17 +304,14 @@ child_attach_to_process (args, from_tty, after_fork) /* Attach to process PID, then initialize for debugging it. */ static void -child_attach (args, from_tty) - char *args; - int from_tty; +child_attach (char *args, int from_tty) { child_attach_to_process (args, from_tty, 0); } #if !defined(CHILD_POST_ATTACH) void -child_post_attach (pid) - int pid; +child_post_attach (int pid) { /* This version of Unix doesn't require a meaningful "post attach" operation by a debugger. */ @@ -330,19 +319,13 @@ child_post_attach (pid) #endif static void -child_require_attach (args, from_tty) - char *args; - int from_tty; +child_require_attach (char *args, int from_tty) { child_attach_to_process (args, from_tty, 1); } static void -child_detach_from_process (pid, args, from_tty, after_fork) - int pid; - char *args; - int from_tty; - int after_fork; +child_detach_from_process (int pid, char *args, int from_tty, int after_fork) { #ifdef ATTACH_DETACH { @@ -383,9 +366,7 @@ child_detach_from_process (pid, args, from_tty, after_fork) started via the normal ptrace (PTRACE_TRACEME). */ static void -child_detach (args, from_tty) - char *args; - int from_tty; +child_detach (char *args, int from_tty) { child_detach_from_process (inferior_pid, args, from_tty, 0); inferior_pid = 0; @@ -393,10 +374,7 @@ child_detach (args, from_tty) } static void -child_require_detach (pid, args, from_tty) - int pid; - char *args; - int from_tty; +child_require_detach (int pid, char *args, int from_tty) { child_detach_from_process (pid, args, from_tty, 1); } @@ -409,7 +387,7 @@ child_require_detach (pid, args, from_tty) debugged. */ static void -child_prepare_to_store () +child_prepare_to_store (void) { #ifdef CHILD_PREPARE_TO_STORE CHILD_PREPARE_TO_STORE (); @@ -419,8 +397,7 @@ child_prepare_to_store () /* Print status information about what we're accessing. */ static void -child_files_info (ignore) - struct target_ops *ignore; +child_files_info (struct target_ops *ignore) { printf_unfiltered ("\tUsing the running image of %s %s.\n", attach_flag ? "attached" : "child", target_pid_to_str (inferior_pid)); @@ -428,9 +405,7 @@ child_files_info (ignore) /* ARGSUSED */ static void -child_open (arg, from_tty) - char *arg; - int from_tty; +child_open (char *arg, int from_tty) { error ("Use the \"run\" command to start a Unix child process."); } @@ -439,7 +414,7 @@ child_open (arg, from_tty) by its parent process. */ static void -ptrace_me () +ptrace_me (void) { /* "Trace me, Dr. Memory!" */ call_ptrace (0, 0, (PTRACE_ARG3_TYPE) 0, 0); @@ -449,8 +424,7 @@ ptrace_me () the child process. */ static void -ptrace_him (pid) - int pid; +ptrace_him (int pid) { push_target (&child_ops); @@ -480,10 +454,7 @@ ptrace_him (pid) ENV is the environment vector to pass. Errors reported with error(). */ static void -child_create_inferior (exec_file, allargs, env) - char *exec_file; - char *allargs; - char **env; +child_create_inferior (char *exec_file, char *allargs, char **env) { #ifdef HPUXHPPA fork_inferior (exec_file, allargs, env, ptrace_me, ptrace_him, pre_fork_inferior, NULL); @@ -497,8 +468,7 @@ child_create_inferior (exec_file, allargs, env) #if !defined(CHILD_POST_STARTUP_INFERIOR) void -child_post_startup_inferior (pid) - int pid; +child_post_startup_inferior (int pid) { /* This version of Unix doesn't require a meaningful "post startup inferior" operation by a debugger. @@ -508,8 +478,7 @@ child_post_startup_inferior (pid) #if !defined(CHILD_ACKNOWLEDGE_CREATED_INFERIOR) void -child_acknowledge_created_inferior (pid) - int pid; +child_acknowledge_created_inferior (int pid) { /* This version of Unix doesn't require a meaningful "acknowledge created inferior" operation by a debugger. @@ -519,9 +488,7 @@ child_acknowledge_created_inferior (pid) void -child_clone_and_follow_inferior (child_pid, followed_child) - int child_pid; - int *followed_child; +child_clone_and_follow_inferior (int child_pid, int *followed_child) { clone_and_follow_inferior (child_pid, followed_child); @@ -533,7 +500,7 @@ child_clone_and_follow_inferior (child_pid, followed_child) #if !defined(CHILD_POST_FOLLOW_INFERIOR_BY_CLONE) void -child_post_follow_inferior_by_clone () +child_post_follow_inferior_by_clone (void) { /* This version of Unix doesn't require a meaningful "post follow inferior" operation by a clone debugger. @@ -543,8 +510,7 @@ child_post_follow_inferior_by_clone () #if !defined(CHILD_INSERT_FORK_CATCHPOINT) int -child_insert_fork_catchpoint (pid) - int pid; +child_insert_fork_catchpoint (int pid) { /* This version of Unix doesn't support notification of fork events. */ return 0; @@ -553,8 +519,7 @@ child_insert_fork_catchpoint (pid) #if !defined(CHILD_REMOVE_FORK_CATCHPOINT) int -child_remove_fork_catchpoint (pid) - int pid; +child_remove_fork_catchpoint (int pid) { /* This version of Unix doesn't support notification of fork events. */ return 0; @@ -563,8 +528,7 @@ child_remove_fork_catchpoint (pid) #if !defined(CHILD_INSERT_VFORK_CATCHPOINT) int -child_insert_vfork_catchpoint (pid) - int pid; +child_insert_vfork_catchpoint (int pid) { /* This version of Unix doesn't support notification of vfork events. */ return 0; @@ -573,8 +537,7 @@ child_insert_vfork_catchpoint (pid) #if !defined(CHILD_REMOVE_VFORK_CATCHPOINT) int -child_remove_vfork_catchpoint (pid) - int pid; +child_remove_vfork_catchpoint (int pid) { /* This version of Unix doesn't support notification of vfork events. */ return 0; @@ -583,9 +546,7 @@ child_remove_vfork_catchpoint (pid) #if !defined(CHILD_HAS_FORKED) int -child_has_forked (pid, child_pid) - int pid; - int *child_pid; +child_has_forked (int pid, int *child_pid) { /* This version of Unix doesn't support notification of fork events. */ return 0; @@ -595,9 +556,7 @@ child_has_forked (pid, child_pid) #if !defined(CHILD_HAS_VFORKED) int -child_has_vforked (pid, child_pid) - int pid; - int *child_pid; +child_has_vforked (int pid, int *child_pid) { /* This version of Unix doesn't support notification of vfork events. */ @@ -608,7 +567,7 @@ child_has_vforked (pid, child_pid) #if !defined(CHILD_CAN_FOLLOW_VFORK_PRIOR_TO_EXEC) int -child_can_follow_vfork_prior_to_exec () +child_can_follow_vfork_prior_to_exec (void) { /* This version of Unix doesn't support notification of vfork events. However, if it did, it probably wouldn't allow vforks to be followed @@ -621,11 +580,8 @@ child_can_follow_vfork_prior_to_exec () #if !defined(CHILD_POST_FOLLOW_VFORK) void -child_post_follow_vfork (parent_pid, followed_parent, child_pid, followed_child) - int parent_pid; - int followed_parent; - int child_pid; - int followed_child; +child_post_follow_vfork (int parent_pid, int followed_parent, int child_pid, + int followed_child) { /* This version of Unix doesn't require a meaningful "post follow vfork" operation by a clone debugger. @@ -635,8 +591,7 @@ child_post_follow_vfork (parent_pid, followed_parent, child_pid, followed_child) #if !defined(CHILD_INSERT_EXEC_CATCHPOINT) int -child_insert_exec_catchpoint (pid) - int pid; +child_insert_exec_catchpoint (int pid) { /* This version of Unix doesn't support notification of exec events. */ return 0; @@ -645,8 +600,7 @@ child_insert_exec_catchpoint (pid) #if !defined(CHILD_REMOVE_EXEC_CATCHPOINT) int -child_remove_exec_catchpoint (pid) - int pid; +child_remove_exec_catchpoint (int pid) { /* This version of Unix doesn't support notification of exec events. */ return 0; @@ -655,9 +609,7 @@ child_remove_exec_catchpoint (pid) #if !defined(CHILD_HAS_EXECD) int -child_has_execd (pid, execd_pathname) - int pid; - char **execd_pathname; +child_has_execd (int pid, char **execd_pathname) { /* This version of Unix doesn't support notification of exec events. */ @@ -668,7 +620,7 @@ child_has_execd (pid, execd_pathname) #if !defined(CHILD_REPORTED_EXEC_EVENTS_PER_EXEC_CALL) int -child_reported_exec_events_per_exec_call () +child_reported_exec_events_per_exec_call (void) { /* This version of Unix doesn't support notification of exec events. */ @@ -679,10 +631,7 @@ child_reported_exec_events_per_exec_call () #if !defined(CHILD_HAS_SYSCALL_EVENT) int -child_has_syscall_event (pid, kind, syscall_id) - int pid; - enum target_waitkind *kind; - int *syscall_id; +child_has_syscall_event (int pid, enum target_waitkind *kind, int *syscall_id) { /* This version of Unix doesn't support notification of syscall events. */ @@ -693,10 +642,7 @@ child_has_syscall_event (pid, kind, syscall_id) #if !defined(CHILD_HAS_EXITED) int -child_has_exited (pid, wait_status, exit_status) - int pid; - int wait_status; - int *exit_status; +child_has_exited (int pid, int wait_status, int *exit_status) { if (WIFEXITED (wait_status)) { @@ -719,14 +665,14 @@ child_has_exited (pid, wait_status, exit_status) static void -child_mourn_inferior () +child_mourn_inferior (void) { unpush_target (&child_ops); generic_mourn_inferior (); } static int -child_can_run () +child_can_run (void) { /* This variable is controlled by modules that sit atop inftarg that may layer their own process structure atop that provided here. hpux-thread.c does @@ -742,7 +688,7 @@ child_can_run () killpg() instead of kill (-pgrp). */ static void -child_stop () +child_stop (void) { extern pid_t inferior_process_group; @@ -751,9 +697,7 @@ child_stop () #if !defined(CHILD_ENABLE_EXCEPTION_CALLBACK) struct symtab_and_line * -child_enable_exception_callback (kind, enable) - enum exception_event_kind kind; - int enable; +child_enable_exception_callback (enum exception_event_kind kind, int enable) { return (struct symtab_and_line *) NULL; } @@ -761,7 +705,7 @@ child_enable_exception_callback (kind, enable) #if !defined(CHILD_GET_CURRENT_EXCEPTION_EVENT) struct exception_event_record * -child_get_current_exception_event () +child_get_current_exception_event (void) { return (struct exception_event_record *) NULL; } @@ -770,8 +714,7 @@ child_get_current_exception_event () #if !defined(CHILD_PID_TO_EXEC_FILE) char * -child_pid_to_exec_file (pid) - int pid; +child_pid_to_exec_file (int pid) { /* This version of Unix doesn't support translation of a process ID to the filename of the executable file. @@ -781,8 +724,7 @@ child_pid_to_exec_file (pid) #endif char * -child_core_file_to_sym_file (core) - char *core; +child_core_file_to_sym_file (char *core) { /* The target stratum for a running executable need not support this operation. @@ -793,15 +735,14 @@ child_core_file_to_sym_file (core) #if !defined(CHILD_PID_TO_STR) char * -child_pid_to_str (pid) - int pid; +child_pid_to_str (int pid) { return normal_pid_to_str (pid); } #endif static void -init_child_ops () +init_child_ops (void) { child_ops.to_shortname = "child"; child_ops.to_longname = "Unix child process"; @@ -866,7 +807,7 @@ init_child_ops () } void -_initialize_inftarg () +_initialize_inftarg (void) { #ifdef HAVE_OPTIONAL_PROC_FS char procname[32]; -- cgit v1.2.1