* cli/cli-setshow.c (do_setshow_command): Partially revert previous

	change.  Cast to "char **" for var_string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0b6102f..3e0d69d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-28  Daniel Jacobowitz  <dan@codesourcery.com>
 
+       * cli/cli-setshow.c (do_setshow_command): Partially revert previous
+       change.  Cast to "char **" for var_string.
+
+2005-05-28  Daniel Jacobowitz  <dan@codesourcery.com>
+
        * cp-name-parser.y (parse_escape): Revert previous change.  Return
        the input character by default.
 

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 4002953..68c0f62 100644 (file)
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -301,8 +301,8 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
       switch (c->var_type)
        {
        case var_string:
-         if (((char *)c->var)[0] != '\0')
-           fputstr_filtered ((char *)c->var, '"', stb->stream);
+         if (*(char **) c->var)
+           fputstr_filtered (*(char **) c->var, '"', stb->stream);
          break;
        case var_string_noescape:
        case var_optional_filename: