From ddb8e278df4280325c3670159d81379313d675a2 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 27 May 2011 14:56:14 +0000 Subject: 2011-05-27 Pedro Alves gdb/ * defs.h (continuation_ftype, continuation_free_arg_ftype): New typedefs. (add_continuation, add_intermediate_continuation) (add_inferior_continuation): Use them. * continuations.c (struct continuation): Use them. (make_continuation_ftype): Delete. (make_continuation, add_inferior_continuation, add_continuation) (add_intermediate_continuation): Use continuation_ftype and continuation_free_arg_ftype. Rename parameters to shorter names. --- gdb/continuations.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'gdb/continuations.c') diff --git a/gdb/continuations.c b/gdb/continuations.c index 2601a2347c4..1f5c8a466ae 100644 --- a/gdb/continuations.c +++ b/gdb/continuations.c @@ -26,20 +26,18 @@ struct continuation { struct continuation *next; - void (*function) (void *); - void (*free_arg) (void *); + continuation_ftype *function; + continuation_free_arg_ftype *free_arg; void *arg; }; -typedef void (make_continuation_ftype) (void *); - /* Add a new continuation to the continuation chain. Args are FUNCTION to run the continuation up with, and ARG to pass to it. */ static void make_continuation (struct continuation **pmy_chain, - make_continuation_ftype *function, + continuation_ftype *function, void *arg, void (*free_arg) (void *)) { struct continuation *new = XNEW (struct continuation); @@ -113,13 +111,12 @@ discard_my_continuations (struct continuation **list) continuation will be added at the front. */ void -add_inferior_continuation (void (*continuation_hook) (void *), void *args, - void (*continuation_free_args) (void *)) +add_inferior_continuation (continuation_ftype *hook, void *args, + continuation_free_arg_ftype *free_arg) { struct inferior *inf = current_inferior (); - make_continuation (&inf->continuations, continuation_hook, - args, continuation_free_args); + make_continuation (&inf->continuations, hook, args, free_arg); } /* Do all continuations of the current inferior. */ @@ -144,11 +141,10 @@ discard_all_inferior_continuations (struct inferior *inf) void add_continuation (struct thread_info *thread, - void (*continuation_hook) (void *), void *args, - void (*continuation_free_args) (void *)) + continuation_ftype *hook, void *args, + continuation_free_arg_ftype *free_arg) { - make_continuation (&thread->continuations, continuation_hook, - args, continuation_free_args); + make_continuation (&thread->continuations, hook, args, free_arg); } static void @@ -256,12 +252,12 @@ discard_all_continuations (void) void add_intermediate_continuation (struct thread_info *thread, - void (*continuation_hook) - (void *), void *args, - void (*continuation_free_args) (void *)) + continuation_ftype *hook, + void *args, + continuation_free_arg_ftype *free_arg) { - make_continuation (&thread->intermediate_continuations, continuation_hook, - args, continuation_free_args); + make_continuation (&thread->intermediate_continuations, hook, + args, free_arg); } /* Walk down the cmd_continuation list, and execute all the -- cgit v1.2.1