This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Convert 'name' of 'struct varobj' to 'const char *'.


This patch is to change the type of field 'name' of 'struct varobj'
from 'char *' to 'const char *'.

gdb:

2013-08-29  Yao Qi  <yao@codesourcery.com>

	* mi/mi-cmd-var.c (mi_cmd_var_create): Change local variable
	'expr''s type to 'const char *'.  Cast expr to 'void *'.
	* varobj.c (struct varobj) <name>: Change its type to
	'const char *'.
	(varobj_create): Change type of parameter 'expression' to
	'const char *'.
	(free_variable): Cast var->name to 'void *'.
	* varobj.h (varobj_create): Update declaration.
---
 gdb/mi/mi-cmd-var.c |    4 ++--
 gdb/varobj.c        |    8 ++++----
 gdb/varobj.h        |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 57a2f6b..f00908d 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -101,7 +101,7 @@ mi_cmd_var_create (char *command, char **argv, int argc)
   struct varobj *var;
   char *name;
   char *frame;
-  char *expr;
+  const char *expr;
   struct cleanup *old_cleanups;
   enum varobj_type var_type;
 
@@ -117,7 +117,7 @@ mi_cmd_var_create (char *command, char **argv, int argc)
   make_cleanup (xfree, frame);
 
   expr = xstrdup (argv[2]);
-  make_cleanup (xfree, expr);
+  make_cleanup (xfree, (void *) expr);
 
   if (strcmp (name, "-") == 0)
     {
diff --git a/gdb/varobj.c b/gdb/varobj.c
index d4fa6ba..55cd83e 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -126,7 +126,7 @@ struct varobj
      child, then this name will be the child's source name.
      (bar, not foo.bar).  */
   /* NOTE: This is the "expression".  */
-  char *name;
+  const char *name;
 
   /* Alloc'd expression for this child.  Can be used to create a
      root variable corresponding to this child.  */
@@ -605,8 +605,8 @@ find_frame_addr_in_frame_chain (CORE_ADDR frame_addr)
 }
 
 struct varobj *
-varobj_create (char *objname,
-	       char *expression, CORE_ADDR frame, enum varobj_type type)
+varobj_create (char *objname, const char *expression, CORE_ADDR frame,
+	       enum varobj_type type)
 {
   struct varobj *var;
   struct cleanup *old_chain;
@@ -2550,7 +2550,7 @@ free_variable (struct varobj *var)
       xfree (var->root);
     }
 
-  xfree (var->name);
+  xfree ((void *) var->name);
   xfree (var->obj_name);
   xfree (var->print_value);
   xfree (var->path_expr);
diff --git a/gdb/varobj.h b/gdb/varobj.h
index 05b2c94..db73748 100644
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -91,7 +91,7 @@ DEF_VEC_O (varobj_update_result);
 /* API functions */
 
 extern struct varobj *varobj_create (char *objname,
-				     char *expression, CORE_ADDR frame,
+				     const char *expression, CORE_ADDR frame,
 				     enum varobj_type type);
 
 extern char *varobj_gen_name (void);
-- 
1.7.7.6


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]