From 58d5e2c3ff4b447730a33cde385905bf5f4436c0 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 17 Apr 2012 21:24:47 +0000 Subject: [PATCH] * cleanups.c (make_my_cleanup,make_my_cleanup2): Make static. (discard_my_cleanups,save_my_cleanups,restore_my_cleanups): Ditto. * cleanups.h (make_my_cleanup,make_my_cleanup2): Delete (discard_my_cleanups,save_my_cleanups,restore_my_cleanups): Delete. --- gdb/ChangeLog | 5 +++++ gdb/cleanups.c | 10 +++++----- gdb/cleanups.h | 9 --------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d6a4daae9c..ac7921793e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2012-04-17 Doug Evans + * cleanups.c (make_my_cleanup,make_my_cleanup2): Make static. + (discard_my_cleanups,save_my_cleanups,restore_my_cleanups): Ditto. + * cleanups.h (make_my_cleanup,make_my_cleanup2): Delete + (discard_my_cleanups,save_my_cleanups,restore_my_cleanups): Delete. + * cleanups.h: New file. * cleanups.c: New file. * Makefile.in (SFILES): Add cleanups.c. diff --git a/gdb/cleanups.c b/gdb/cleanups.c index 9d893ac8ae..988b92e6da 100644 --- a/gdb/cleanups.c +++ b/gdb/cleanups.c @@ -37,7 +37,7 @@ static struct cleanup *final_cleanup_chain; The result is a pointer to the previous chain pointer to be passed later to do_cleanups or discard_cleanups. */ -struct cleanup * +static struct cleanup * make_my_cleanup2 (struct cleanup **pmy_chain, make_cleanup_ftype *function, void *arg, void (*free_arg) (void *)) { @@ -62,7 +62,7 @@ make_my_cleanup2 (struct cleanup **pmy_chain, make_cleanup_ftype *function, The result is a pointer to the previous chain pointer to be passed later to do_cleanups or discard_cleanups. */ -struct cleanup * +static struct cleanup * make_my_cleanup (struct cleanup **pmy_chain, make_cleanup_ftype *function, void *arg) { @@ -143,7 +143,7 @@ do_final_cleanups (struct cleanup *old_chain) OLD_CHAIN is the result of a "make" cleanup routine. Cleanups are discarded until we get back to the old end of the chain. */ -void +static void discard_my_cleanups (struct cleanup **pmy_chain, struct cleanup *old_chain) { @@ -180,7 +180,7 @@ discard_final_cleanups (struct cleanup *old_chain) PMY_CHAIN is a pointer to either cleanup_chain or final_cleanup_chain. The chain is emptied and the result is a pointer to the old chain. */ -struct cleanup * +static struct cleanup * save_my_cleanups (struct cleanup **pmy_chain) { struct cleanup *old_chain = *pmy_chain; @@ -210,7 +210,7 @@ save_final_cleanups (void) PMY_CHAIN is a pointer to either cleanup_chain or final_cleanup_chain. The chain is restored from CHAIN. */ -void +static void restore_my_cleanups (struct cleanup **pmy_chain, struct cleanup *chain) { *pmy_chain = chain; diff --git a/gdb/cleanups.h b/gdb/cleanups.h index 80cbada39e..689c0d1090 100644 --- a/gdb/cleanups.h +++ b/gdb/cleanups.h @@ -61,12 +61,6 @@ extern struct cleanup *make_cleanup_dtor (make_cleanup_ftype *, void *, extern struct cleanup *make_final_cleanup (make_cleanup_ftype *, void *); -extern struct cleanup *make_my_cleanup (struct cleanup **, - make_cleanup_ftype *, void *); -extern struct cleanup *make_my_cleanup2 (struct cleanup **, - make_cleanup_ftype *, void *, - void (*free_arg) (void *)); - /* A special value to pass to do_cleanups and do_final_cleanups to tell them to do all cleanups. */ #define ALL_CLEANUPS ((struct cleanup *)0) @@ -76,15 +70,12 @@ extern void do_final_cleanups (struct cleanup *); extern void discard_cleanups (struct cleanup *); extern void discard_final_cleanups (struct cleanup *); -extern void discard_my_cleanups (struct cleanup **, struct cleanup *); extern struct cleanup *save_cleanups (void); extern struct cleanup *save_final_cleanups (void); -extern struct cleanup *save_my_cleanups (struct cleanup **); extern void restore_cleanups (struct cleanup *); extern void restore_final_cleanups (struct cleanup *); -extern void restore_my_cleanups (struct cleanup **, struct cleanup *); /* A no-op cleanup. This is useful when you want to establish a known reference point