summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/solib.c13
2 files changed, 12 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 65f6e2c50db..902d9714d1b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -40,6 +40,12 @@ Fri Mar 24 13:44:57 2000 Andrew Cagney <cagney@b1.cygnus.com>
* MAINTAINERS: Add Fernando Nasser to testsuite maintainers.
+2000-03-23 Michael Snyder <msnyder@cleaver.cygnus.com>
+
+ * solib.c (open_symbol_file_object): to sneak an int argument
+ past catch_errors, instead of casting it to a pointer, simply
+ pass it by address.
+
2000-03-23 Jimmy Guo <guo@cup.hp.com>
* gdbtypes.c (rank_function): Rank all N parameters and use correct
diff --git a/gdb/solib.c b/gdb/solib.c
index 621bd6cc425..c9eaa5928c3 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -921,7 +921,7 @@ first_link_map_member ()
LOCAL FUNCTION
- open_exec_file_object
+ open_symbol_file_object
SYNOPSIS
@@ -936,11 +936,10 @@ first_link_map_member ()
*/
-int
-open_symbol_file_object (arg)
- PTR arg;
+static int
+open_symbol_file_object (from_ttyp)
+ int *from_ttyp; /* sneak past catch_errors */
{
- int from_tty = (int) arg; /* sneak past catch_errors */
CORE_ADDR lm;
struct link_map lmcopy;
char *filename;
@@ -975,7 +974,7 @@ open_symbol_file_object (arg)
make_cleanup ((make_cleanup_func) free, (void *) filename);
/* Have a pathname: read the symbol file. */
- symbol_file_command (filename, from_tty);
+ symbol_file_command (filename, *from_ttyp);
return 1;
}
@@ -1234,7 +1233,7 @@ solib_add (char *pattern, int from_tty, struct target_ops *target)
symbols now! */
if (attach_flag &&
symfile_objfile == NULL)
- catch_errors (open_symbol_file_object, (PTR) from_tty,
+ catch_errors (open_symbol_file_object, (PTR) &from_tty,
"Error reading attached process's symbol file.\n",
RETURN_MASK_ALL);