gdb/

	* cli/cli-setshow.c (do_setshow_command): Don't check pointer is
	NULL for xfree.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 60810d1c548b6a2fd559001767ab84fb443161e6..f88fbeb98a269470883ff96941eb16546620971b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-20  Yao Qi  <yao@codesourcery.com>
+
+       * cli/cli-setshow.c (do_setshow_command): Don't check pointer is
+       NULL for xfree.
+
 2012-07-19  Pedro Alves  <palves@redhat.com>
 
        * record.c (record_resume): Ask the target beneath to report all

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index dccf4255429e4c056ede08d1c29639d593671a40..5ec7b55881ff212833c0fd352328b902e9d15fb5 100644 (file)
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -170,16 +170,14 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 #endif
            *q++ = '\0';
            new = (char *) xrealloc (new, q - new);
-           if (*(char **) c->var != NULL)
-             xfree (*(char **) c->var);
+           xfree (*(char **) c->var);
            *(char **) c->var = new;
          }
          break;
        case var_string_noescape:
          if (arg == NULL)
            arg = "";
-         if (*(char **) c->var != NULL)
-           xfree (*(char **) c->var);
+         xfree (*(char **) c->var);
          *(char **) c->var = xstrdup (arg);
          break;
        case var_filename:
@@ -187,8 +185,7 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
            error_no_arg (_("filename to set it to."));
          /* FALLTHROUGH */
        case var_optional_filename:
-         if (*(char **) c->var != NULL)
-           xfree (*(char **) c->var);
+         xfree (*(char **) c->var);
 
          if (arg != NULL)
            {