diff options
| -rw-r--r-- | gdb/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/Makefile.in | 2 | ||||
| -rw-r--r-- | gdb/ada-varobj.c | 16 | ||||
| -rw-r--r-- | gdb/ada-varobj.h | 55 |
4 files changed, 22 insertions, 63 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index db0982a..4b7e028 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2013-10-17 Yao Qi <yao@codesourcery.com> + * Makefile.in (HFILES_NO_SRCDIR): Remove ada-varobj.h. + * ada-varobj.c: Remove the include of ada-varobj.h. + (ada_varobj_get_number_of_children): Declare. + (ada_varobj_get_name_of_child): Make it static. + (ada_varobj_get_path_expr_of_child): Likewise. + (ada_varobj_get_value_of_child): Likewise. + (ada_varobj_get_type_of_child): Likewise. + (ada_varobj_get_value_of_array_variable): Likewise. + * ada-varobj.h: Remove. + +2013-10-17 Yao Qi <yao@codesourcery.com> + * Makefile.in (SFILES): Add c-varobj.c and jv-varobj.c. (COMMON_OBS): Add c-varobj.o and jv-varobj.o. * ada-varobj.c: Include "varobj.h". diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f8abb35..fc2a3af 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -795,7 +795,7 @@ proc-utils.h aarch64-tdep.h arm-tdep.h ax-gdb.h ppcfbsd-tdep.h \ ppcnbsd-tdep.h cli-out.h gdb_expat.h breakpoint.h infcall.h obsd-tdep.h \ exec.h m32r-tdep.h osabi.h gdbcore.h solib-som.h amd64bsd-nat.h \ i386bsd-nat.h xml-support.h xml-tdesc.h alphabsd-tdep.h gdb_obstack.h \ -ia64-tdep.h ada-lang.h ada-varobj.h varobj.h frv-tdep.h nto-tdep.h serial.h \ +ia64-tdep.h ada-lang.h varobj.h frv-tdep.h nto-tdep.h serial.h \ c-lang.h d-lang.h go-lang.h frame.h event-loop.h block.h cli/cli-setshow.h \ cli/cli-decode.h cli/cli-cmds.h cli/cli-utils.h \ cli/cli-script.h macrotab.h symtab.h common/version.h \ diff --git a/gdb/ada-varobj.c b/gdb/ada-varobj.c index 52c76875..62454b8 100644 --- a/gdb/ada-varobj.c +++ b/gdb/ada-varobj.c @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "defs.h" -#include "ada-varobj.h" #include "ada-lang.h" #include "varobj.h" #include "language.h" @@ -49,6 +48,9 @@ it allows the code to use the type without having to worry about it being set or not. It makes the code clearer. */ +static int ada_varobj_get_number_of_children (struct value *parent_value, + struct type *parent_type); + /* A convenience function that decodes the VALUE_PTR/TYPE_PTR couple: If there is a value (*VALUE_PTR not NULL), then perform the decoding using it, and compute the associated type from the resulting value. @@ -324,7 +326,7 @@ ada_varobj_get_ptr_number_of_children (struct value *parent_value, /* Return the number of children for the (PARENT_VALUE, PARENT_TYPE) pair. */ -int +static int ada_varobj_get_number_of_children (struct value *parent_value, struct type *parent_type) { @@ -722,7 +724,7 @@ ada_varobj_describe_child (struct value *parent_value, The result should be deallocated after use with xfree. */ -char * +static char * ada_varobj_get_name_of_child (struct value *parent_value, struct type *parent_type, const char *parent_name, int child_index) @@ -742,7 +744,7 @@ ada_varobj_get_name_of_child (struct value *parent_value, The result must be deallocated after use with xfree. */ -char * +static char * ada_varobj_get_path_expr_of_child (struct value *parent_value, struct type *parent_type, const char *parent_name, @@ -761,7 +763,7 @@ ada_varobj_get_path_expr_of_child (struct value *parent_value, /* Return the value of child number CHILD_INDEX of the (PARENT_VALUE, PARENT_TYPE) pair. PARENT_NAME is the name of the parent. */ -struct value * +static struct value * ada_varobj_get_value_of_child (struct value *parent_value, struct type *parent_type, const char *parent_name, int child_index) @@ -778,7 +780,7 @@ ada_varobj_get_value_of_child (struct value *parent_value, /* Return the type of child number CHILD_INDEX of the (PARENT_VALUE, PARENT_TYPE) pair. */ -struct type * +static struct type * ada_varobj_get_type_of_child (struct value *parent_value, struct type *parent_type, int child_index) @@ -857,7 +859,7 @@ ada_varobj_get_value_of_array_variable (struct value *value, /* Return a string representation of the (VALUE, TYPE) pair, using the given print options OPTS as our formatting options. */ -char * +static char * ada_varobj_get_value_of_variable (struct value *value, struct type *type, struct value_print_options *opts) diff --git a/gdb/ada-varobj.h b/gdb/ada-varobj.h deleted file mode 100644 index 924997d..0000000 --- a/gdb/ada-varobj.h +++ /dev/null @@ -1,55 +0,0 @@ -/* varobj support for Ada. - - Copyright (C) 2012-2013 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef ADA_VAROBJ_H -#define ADA_VAROBJ_H - -#include "varobj.h" - -struct value; -struct value_print_options; - -extern int ada_varobj_get_number_of_children (struct value *parent_value, - struct type *parent_type); - -extern char *ada_varobj_get_name_of_child (struct value *parent_value, - struct type *parent_type, - const char *parent_name, - int child_index); - -extern char *ada_varobj_get_path_expr_of_child (struct value *parent_value, - struct type *parent_type, - const char *parent_name, - const char *parent_path_expr, - int child_index); - -extern struct value *ada_varobj_get_value_of_child (struct value *parent_value, - struct type *parent_type, - const char *parent_name, - int child_index); - -extern struct type *ada_varobj_get_type_of_child (struct value *parent_value, - struct type *parent_type, - int child_index); - -extern char *ada_varobj_get_value_of_variable - (struct value *value, struct type *type, - struct value_print_options *opts); - -#endif /* ADA_VAROBJ_H */ |