Rename variables hiding others defined on another scope.

* gdbtk/generic/gdbtk-cmds.c (gdb_find_file_command): rename struct stat st to
  sbuf.
* gdbtk/generic/gdbtk-varobj.c (variable_update): rename Tcl_Obj *var to v.
* gdbtk/generic/gdbtk.c: global gdbtk_source_filename is now an std::string.
  (gdbtk_source_start_file): drop const char *s, rephrase concatenation in C++.
  (gdbtk_test): xstrdup is not needed anymore.

diff --git a/gdbtk/generic/gdbtk-cmds.c b/gdbtk/generic/gdbtk-cmds.c
index 45e277ea70342e37d3a6401605a5785232d7e135..78803ca03cba90a0395cb75ba010b27c23cdcc4f 100644 (file)
--- a/gdbtk/generic/gdbtk-cmds.c
+++ b/gdbtk/generic/gdbtk-cmds.c
@@ -1112,12 +1112,12 @@ gdb_find_file_command (ClientData clientData, Tcl_Interp *interp,
      to stat it. If it's not found, then ask gdb to find it for us. */
   if (IS_ABSOLUTE_PATH (filename))
     {
-      struct stat st;
-      const int status = stat (filename, &st);
+      struct stat sbuf;
+      const int status = stat (filename, &sbuf);
 
       if (status == 0)
        {
-         if (S_ISREG (st.st_mode))
+         if (S_ISREG (sbuf.st_mode))
            fullname = filename;
        }
     }

diff --git a/gdbtk/generic/gdbtk-varobj.c b/gdbtk/generic/gdbtk-varobj.c
index 1655be2ae67369db0eaa2aae503e85293f658661..eca19952074e71dd295e084526824cd34145baae 100644 (file)
--- a/gdbtk/generic/gdbtk-varobj.c
+++ b/gdbtk/generic/gdbtk-varobj.c
@@ -476,9 +476,8 @@ variable_update (Tcl_Interp *interp, struct varobj **var)
        {
        case VAROBJ_IN_SCOPE:
          {
-           Tcl_Obj *var
-             =  Tcl_NewStringObj (varobj_get_objname (r->varobj), -1);
-           Tcl_ListObjAppendElement (NULL, changed, var);
+           Tcl_Obj *v = Tcl_NewStringObj (varobj_get_objname (r->varobj), -1);
+           Tcl_ListObjAppendElement (NULL, changed, v);
          }
          break;
 

diff --git a/gdbtk/generic/gdbtk.c b/gdbtk/generic/gdbtk.c
index 3c2969b3fa6883114c559fc1f5f5aa0280e4bedc..0f3a7cff297c6e59b437257597a6cb3dc3777c69 100644 (file)
--- a/gdbtk/generic/gdbtk.c
+++ b/gdbtk/generic/gdbtk.c
@@ -138,7 +138,7 @@ int running_now;
 
 /* This variable holds the name of a Tcl file which should be sourced by the
    interpreter when it goes idle at startup. Used with the testsuite. */
-static char *gdbtk_source_filename = NULL;
+static std::string gdbtk_source_filename;
 
 bool gdbtk_disable_write = true;
 \f
@@ -1009,13 +1009,11 @@ gdbtk_find_main";
   /* Now source in the filename provided by the --tclcommand option.
      This is mostly used for the gdbtk testsuite... */
 
-  if (gdbtk_source_filename != NULL)
+  if (gdbtk_source_filename.length ())
     {
-      const char *s = "after idle source ";
-      char *script = concat (s, gdbtk_source_filename, (char *) NULL);
-      Tcl_Eval (gdbtk_tcl_interp, script);
-      free (gdbtk_source_filename);
-      free (script);
+      Tcl_Eval (gdbtk_tcl_interp,
+                ("after idle source " + gdbtk_source_filename).c_str ());
+      gdbtk_source_filename.clear ();
     }
 }
 
@@ -1028,8 +1026,7 @@ gdbtk_test (char *filename)
 {
   if (access (filename, R_OK) != 0)
     return 0;
-  else
-    gdbtk_source_filename = xstrdup (filename);
+  gdbtk_source_filename = filename;
   return 1;
 }