OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb/ 

* dwarf2read.c (typename_concat): Use (char *) NULL terminated stdarg
	list for the obconcat call.
	* mdebugread.c (parse_symbol): Likewise.
	* stabsread.c (define_symbol, read_member_functions, read_cpp_abbrev):
	Likewise.
	* symfile.c (obconcat): Replace the s1, s2 and s3 parameters by `...'.
	New variable ap.  Remove variables len and val.
	* symfile.h (obconcat): Likewise for the prototype.
This commit is contained in:
Jan Kratochvil 2010-05-08 04:58:45 +00:00
parent 8ef4892fb6
commit 48cb83fdd0
6 changed files with 56 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2010-05-08 Jan Kratochvil <jan.kratochvil@redhat.com>
* dwarf2read.c (typename_concat): Use (char *) NULL terminated stdarg
list for the obconcat call.
* mdebugread.c (parse_symbol): Likewise.
* stabsread.c (define_symbol, read_member_functions, read_cpp_abbrev):
Likewise.
* symfile.c (obconcat): Replace the s1, s2 and s3 parameters by `...'.
New variable ap. Remove variables len and val.
* symfile.h (obconcat): Likewise for the prototype.
2010-05-07 Michael Snyder <msnyder@vmware.com> 2010-05-07 Michael Snyder <msnyder@vmware.com>
* python/python.c (execute_gdb_command): Remove unused variables. * python/python.c (execute_gdb_command): Remove unused variables.

2
gdb/dwarf2read.c
View File

@ -9200,7 +9200,7 @@ typename_concat (struct obstack *obs, const char *prefix, const char *suffix,
else else
{ {
/* We have an obstack. */ /* We have an obstack. */
return obconcat (obs, prefix, sep, suffix); return obconcat (obs, prefix, sep, suffix, (char *) NULL);
} }
} }

4
gdb/mdebugread.c
View File

@ -998,8 +998,8 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
if (sh->iss == 0 || name[0] == '.' || name[0] == '\0') if (sh->iss == 0 || name[0] == '.' || name[0] == '\0')
TYPE_TAG_NAME (t) = NULL; TYPE_TAG_NAME (t) = NULL;
else else
TYPE_TAG_NAME (t) = obconcat (&current_objfile->objfile_obstack, TYPE_TAG_NAME (t) = obconcat (&current_objfile->objfile_obstack, name,
"", "", name); (char *) NULL);
TYPE_CODE (t) = type_code; TYPE_CODE (t) = type_code;
TYPE_LENGTH (t) = sh->value; TYPE_LENGTH (t) = sh->value;

36
gdb/stabsread.c
View File

@ -1279,9 +1279,9 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type,
SYMBOL_VALUE (struct_sym) = valu; SYMBOL_VALUE (struct_sym) = valu;
SYMBOL_DOMAIN (struct_sym) = STRUCT_DOMAIN; SYMBOL_DOMAIN (struct_sym) = STRUCT_DOMAIN;
if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0) if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0)
TYPE_NAME (SYMBOL_TYPE (sym)) TYPE_NAME (SYMBOL_TYPE (sym)) = obconcat (&objfile->objfile_obstack,
= obconcat (&objfile->objfile_obstack, "", "", SYMBOL_LINKAGE_NAME (sym),
SYMBOL_LINKAGE_NAME (sym)); (char *) NULL);
add_symbol_to_list (struct_sym, &file_symbols); add_symbol_to_list (struct_sym, &file_symbols);
} }
@ -1306,9 +1306,9 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type,
SYMBOL_VALUE (sym) = valu; SYMBOL_VALUE (sym) = valu;
SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN; SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN;
if (TYPE_TAG_NAME (SYMBOL_TYPE (sym)) == 0) if (TYPE_TAG_NAME (SYMBOL_TYPE (sym)) == 0)
TYPE_TAG_NAME (SYMBOL_TYPE (sym)) TYPE_TAG_NAME (SYMBOL_TYPE (sym)) = obconcat (&objfile->objfile_obstack,
= obconcat (&objfile->objfile_obstack, "", "", SYMBOL_LINKAGE_NAME (sym),
SYMBOL_LINKAGE_NAME (sym)); (char *) NULL);
add_symbol_to_list (sym, &file_symbols); add_symbol_to_list (sym, &file_symbols);
if (synonym) if (synonym)
@ -1321,9 +1321,9 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type,
SYMBOL_VALUE (typedef_sym) = valu; SYMBOL_VALUE (typedef_sym) = valu;
SYMBOL_DOMAIN (typedef_sym) = VAR_DOMAIN; SYMBOL_DOMAIN (typedef_sym) = VAR_DOMAIN;
if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0) if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0)
TYPE_NAME (SYMBOL_TYPE (sym)) TYPE_NAME (SYMBOL_TYPE (sym)) = obconcat (&objfile->objfile_obstack,
= obconcat (&objfile->objfile_obstack, "", "", SYMBOL_LINKAGE_NAME (sym),
SYMBOL_LINKAGE_NAME (sym)); (char *) NULL);
add_symbol_to_list (typedef_sym, &file_symbols); add_symbol_to_list (typedef_sym, &file_symbols);
} }
break; break;
@ -2609,8 +2609,8 @@ read_member_functions (struct field_info *fip, char **pp, struct type *type,
make_cleanup (xfree, destr_fnlist); make_cleanup (xfree, destr_fnlist);
memset (destr_fnlist, 0, sizeof (struct next_fnfieldlist)); memset (destr_fnlist, 0, sizeof (struct next_fnfieldlist));
destr_fnlist->fn_fieldlist.name destr_fnlist->fn_fieldlist.name
= obconcat (&objfile->objfile_obstack, "", "~", = obconcat (&objfile->objfile_obstack, "~",
new_fnlist->fn_fieldlist.name); new_fnlist->fn_fieldlist.name, (char *) NULL);
destr_fnlist->fn_fieldlist.fn_fields = (struct fn_field *) destr_fnlist->fn_fieldlist.fn_fields = (struct fn_field *)
obstack_alloc (&objfile->objfile_obstack, obstack_alloc (&objfile->objfile_obstack,
@ -2747,8 +2747,8 @@ read_cpp_abbrev (struct field_info *fip, char **pp, struct type *type,
{ {
name = ""; name = "";
} }
fip->list->field.name = fip->list->field.name = obconcat (&objfile->objfile_obstack,
obconcat (&objfile->objfile_obstack, vptr_name, name, ""); vptr_name, name, (char *) NULL);
break; break;
case 'b': /* $vb -- a virtual bsomethingorother */ case 'b': /* $vb -- a virtual bsomethingorother */
@ -2760,15 +2760,15 @@ read_cpp_abbrev (struct field_info *fip, char **pp, struct type *type,
symnum); symnum);
name = "FOO"; name = "FOO";
} }
fip->list->field.name = fip->list->field.name = obconcat (&objfile->objfile_obstack, vb_name,
obconcat (&objfile->objfile_obstack, vb_name, name, ""); name, (char *) NULL);
break; break;
default: default:
invalid_cpp_abbrev_complaint (*pp); invalid_cpp_abbrev_complaint (*pp);
fip->list->field.name = fip->list->field.name = obconcat (&objfile->objfile_obstack,
obconcat (&objfile->objfile_obstack, "INVALID_CPLUSPLUS_ABBREV",
"INVALID_CPLUSPLUS_ABBREV", "", ""); (char *) NULL);
break; break;
} }

30
gdb/symfile.c
View File

@ -212,19 +212,29 @@ obsavestring (const char *ptr, int size, struct obstack *obstackp)
return p; return p;
} }
/* Concatenate strings S1, S2 and S3; return the new string. Space is found /* Concatenate NULL terminated variable argument list of `const char *' strings;
in the obstack pointed to by OBSTACKP. */ return the new string. Space is found in the OBSTACKP. Argument list must
be terminated by a sentinel expression `(char *) NULL'. */
char * char *
obconcat (struct obstack *obstackp, const char *s1, const char *s2, obconcat (struct obstack *obstackp, ...)
const char *s3)
{ {
int len = strlen (s1) + strlen (s2) + strlen (s3) + 1; va_list ap;
char *val = (char *) obstack_alloc (obstackp, len);
strcpy (val, s1); va_start (ap, obstackp);
strcat (val, s2); for (;;)
strcat (val, s3); {
return val; const char *s = va_arg (ap, const char *);
if (s == NULL)
break;
obstack_grow_str (obstackp, s);
}
va_end (ap);
obstack_1grow (obstackp, 0);
return obstack_finish (obstackp);
} }
/* True if we are reading a symbol table. */ /* True if we are reading a symbol table. */

8
gdb/symfile.h
View File

@ -458,11 +458,11 @@ extern struct partial_symtab *start_psymtab_common (struct objfile *,
extern char *obsavestring (const char *, int, struct obstack *); extern char *obsavestring (const char *, int, struct obstack *);
/* Concatenate strings S1, S2 and S3; return the new string. Space is /* Concatenate NULL terminated variable argument list of `const char *' strings;
found in the OBSTACKP */ return the new string. Space is found in the OBSTACKP. Argument list must
be terminated by a sentinel expression `(char *) NULL'. */
extern char *obconcat (struct obstack *obstackp, const char *, const char *, extern char *obconcat (struct obstack *obstackp, ...) ATTRIBUTE_SENTINEL;
const char *);
/* Variables */ /* Variables */