darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* completer.c (count_struct_fields): Remove.

Browse source 
(expression_completer): Don't call count_struct_fields.
This commit is contained in:
Tom Tromey 2012-11-20 18:18:39 +00:00
parent bacebabc8e
commit ec6632d76b
2 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2012-11-20 Tom Tromey <tromey@redhat.com>
* completer.c (count_struct_fields): Remove.
(expression_completer): Don't call count_struct_fields.
2012-11-20 Pedro Alves <palves@redhat.com> 2012-11-20 Pedro Alves <palves@redhat.com>
* annotate.c (breakpoints_changed): Rename to ... * annotate.c (breakpoints_changed): Rename to ...

34
gdb/completer.c
View file

@ -327,39 +327,6 @@ location_completer (struct cmd_list_element *ignore,
return list; return list;
} }
/* Helper for expression_completer which recursively counts the number
of named fields and methods in a structure or union type. */
static int
count_struct_fields (struct type *type)
{
int i, result = 0;
CHECK_TYPEDEF (type);
for (i = 0; i < TYPE_NFIELDS (type); ++i)
{
if (i < TYPE_N_BASECLASSES (type))
result += count_struct_fields (TYPE_BASECLASS (type, i));
else if (TYPE_FIELD_NAME (type, i))
{
if (TYPE_FIELD_NAME (type, i)[0] != '\0')
++result;
else if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_UNION)
{
/* Recurse into anonymous unions. */
result += count_struct_fields (TYPE_FIELD_TYPE (type, i));
}
}
}
for (i = TYPE_NFN_FIELDS (type) - 1; i >= 0; --i)
{
if (TYPE_FN_FIELDLIST_NAME (type, i))
++result;
}
return result;
}
/* Helper for expression_completer which recursively adds field and /* Helper for expression_completer which recursively adds field and
method names from TYPE, a struct or union type, to the array method names from TYPE, a struct or union type, to the array
OUTPUT. */ OUTPUT. */
@ -447,7 +414,6 @@ expression_completer (struct cmd_list_element *ignore,
if (TYPE_CODE (type) == TYPE_CODE_UNION if (TYPE_CODE (type) == TYPE_CODE_UNION
|| TYPE_CODE (type) == TYPE_CODE_STRUCT) || TYPE_CODE (type) == TYPE_CODE_STRUCT)
{ {
int alloc = count_struct_fields (type);
int flen = strlen (fieldname); int flen = strlen (fieldname);
VEC (char_ptr) *result = NULL; VEC (char_ptr) *result = NULL;