From ae892643ae2af1bd6f8323851dca33f2c9ca761e Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 8 Jun 2000 08:13:20 +0000 Subject: [PATCH] Purge all uses of make_cleanup_func in GDBtk. --- gdb/gdbtk/generic/ChangeLog | 8 ++++++++ gdb/gdbtk/generic/gdbtk-cmds.c | 6 +++--- gdb/gdbtk/generic/gdbtk.c | 7 +++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gdb/gdbtk/generic/ChangeLog b/gdb/gdbtk/generic/ChangeLog index 0b1b5349b9..2737938153 100644 --- a/gdb/gdbtk/generic/ChangeLog +++ b/gdb/gdbtk/generic/ChangeLog @@ -1,3 +1,11 @@ +Thu Jun 8 17:59:01 2000 Andrew Cagney + + (gdb_load_info): Use make_cleanup_bfd_close. + (gdb_search): Use make_cleanup_free_search_symbols. + * gdbtk.c (cleanup_init): Change signature to match make_cleanups. + (gdbtk_init): Discard make_cleanup_func cast. + * gdbtk-cmds.c (gdb_eval): Ditto. + 2000-06-06 Elena Zannoni * gdbtk.c: Remove CYGWIN32 conditional around timer machinery. diff --git a/gdb/gdbtk/generic/gdbtk-cmds.c b/gdb/gdbtk/generic/gdbtk-cmds.c index 53126e3b31..ed78f08aed 100644 --- a/gdb/gdbtk/generic/gdbtk-cmds.c +++ b/gdb/gdbtk/generic/gdbtk-cmds.c @@ -767,7 +767,7 @@ gdb_eval (clientData, interp, objc, objv) expr = parse_expression (Tcl_GetStringFromObj (objv[1], NULL)); - old_chain = make_cleanup ((make_cleanup_func) free_current_contents, &expr); + old_chain = make_cleanup (free_current_contents, &expr); val = evaluate_expression (expr); @@ -994,7 +994,7 @@ gdb_load_info (clientData, interp, objc, objv) Tcl_SetStringObj (result_ptr->obj_ptr, "Open failed", -1); return TCL_ERROR; } - old_cleanups = make_cleanup ((make_cleanup_func) bfd_close, loadfile_bfd); + old_cleanups = make_cleanup_bfd_close (loadfile_bfd); if (!bfd_check_format (loadfile_bfd, bfd_object)) { @@ -1605,7 +1605,7 @@ gdb_search (clientData, interp, objc, objv) search_symbols (regexp, space, nfiles, files, &ss); if (ss != NULL) - old_chain = make_cleanup ((make_cleanup_func) free_search_symbols, ss); + old_chain = make_cleanup_free_search_symbols (ss); Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL); diff --git a/gdb/gdbtk/generic/gdbtk.c b/gdb/gdbtk/generic/gdbtk.c index 75fc15c1f4..cbb74d688d 100644 --- a/gdb/gdbtk/generic/gdbtk.c +++ b/gdb/gdbtk/generic/gdbtk.c @@ -98,7 +98,7 @@ static void gdbtk_init PARAMS ((char *)); void gdbtk_interactive PARAMS ((void)); -static void cleanup_init PARAMS ((int)); +static void cleanup_init (void *ignore); static void tk_command PARAMS ((char *, int)); @@ -239,8 +239,7 @@ TclDebug (char level, const char *fmt,...) */ static void -cleanup_init (ignored) - int ignored; +cleanup_init (void *ignore) { if (gdbtk_interp != NULL) Tcl_DeleteInterp (gdbtk_interp); @@ -371,7 +370,7 @@ gdbtk_init (argv0) return; #endif - old_chain = make_cleanup ((make_cleanup_func) cleanup_init, 0); + old_chain = make_cleanup (cleanup_init, 0); /* First init tcl and tk. */ Tcl_FindExecutable (argv0); -- 2.11.0