* top.c (get_prompt_1), tracepoint.c (replace_comma): Update

function signatures so that they match catch_errors and
make_cleanup callbacks.
* tracepoint.c (encode_actions): Fix arguments passed to
stringify_collection_list.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6a581df..386220e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Tue Aug  1 14:50:55 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       * top.c (get_prompt_1), tracepoint.c (replace_comma): Update
+       function signatures so that they match catch_errors and
+       make_cleanup callbacks.
+
+       * tracepoint.c (encode_actions): Fix arguments passed to
+       stringify_collection_list.
+
 2000-07-31  Kevin Buettner  <kevinb@redhat.com>
 
        * ppc-tdep.h: New file.

diff --git a/gdb/top.c b/gdb/top.c
index 442f149..ccb6aec 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -3179,8 +3179,9 @@ show_version (char *args, int from_tty)
 static int gdb_prompt_escape;
 
 static int
-get_prompt_1 (char *formatted_prompt)
+get_prompt_1 (void *data)
 {
+  char *formatted_prompt = data;
   char *local_prompt;
 
   if (event_loop_p)

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 83dce01..7d8a631 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1625,8 +1625,8 @@ encode_actions (struct tracepoint *t, char ***tdp_actions,
   memrange_sortmerge (&tracepoint_list);
   memrange_sortmerge (&stepping_list);
 
-  *tdp_actions = stringify_collection_list (&tracepoint_list, &tdp_buff);
-  *stepping_actions = stringify_collection_list (&stepping_list, &step_buff);
+  *tdp_actions = stringify_collection_list (&tracepoint_list, tdp_buff);
+  *stepping_actions = stringify_collection_list (&stepping_list, step_buff);
 }
 
 static void
@@ -2445,8 +2445,9 @@ scope_info (char *args, int from_tty)
 
 /* worker function (cleanup) */
 static void
-replace_comma (char *comma)
+replace_comma (void *data)
 {
+  char *comma = data;
   *comma = ',';
 }