Remove internal gdb definition of fixed arg count concat() function and

convert to use of variable arg count concat() in libiberty.
This commit is contained in:
Fred Fish 1991-11-12 17:50:14 +00:00
parent ecb1b520de
commit 58ae87f612
18 changed files with 35 additions and 35 deletions

View file

@ -1,3 +1,15 @@
Tue Nov 12 09:40:07 1991 Fred Fish (fnf at cygnus.com)
* utils.c, rem-multi.shar: Remove fixed arg count version of
concat().
* altos-xdep.c, arm-xdep.c, coffread.c, command.c, convex-xdep.c,
core.c, dwarfread.c, gould-xdep.c, infcmd.c, language.c,
m88k-xdep.c, main.c, printcmd.c, pyr-xdep.c, source.c,
sun386-xdep.c, symm-xdep.c, umax-xdep.c, values.c, xcoffread.c:
Change all instances of use of fixed args concat() to variable
args concat() now located in libiberty.
Tue Nov 12 07:23:46 1991 John Gilmore (gnu at cygnus.com)
* Makefile.in: Add xcoffread.c, xcoffexec.c.

View file

@ -153,7 +153,7 @@ core_file_command (filename, from_tty)
corefile = savestring (filename, strlen (filename));
else
{
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
}
set_current_frame ( create_new_frame (read_register (FP_REGNUM),

View file

@ -261,7 +261,7 @@ core_file_command (filename, from_tty)
corefile = savestring (filename, strlen (filename));
else
{
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
}
set_current_frame ( create_new_frame (read_register (FP_REGNUM),

View file

@ -1484,7 +1484,7 @@ patch_type (type, real_type)
{
if (TYPE_NAME (target))
free (TYPE_NAME (target));
TYPE_NAME (target) = concat (TYPE_NAME (real_target), "", "");
TYPE_NAME (target) = concat (TYPE_NAME (real_target), NULL);
}
}
@ -1691,7 +1691,7 @@ process_coff_symbol (cs, aux)
if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0
&& (TYPE_FLAGS (SYMBOL_TYPE (sym)) & TYPE_FLAG_PERM) == 0)
TYPE_NAME (SYMBOL_TYPE (sym))
= concat (SYMBOL_NAME (sym), "", "");
= concat (SYMBOL_NAME (sym), NULL);
/* Keep track of any type which points to empty structured type,
so it can be filled from a definition from another file */
@ -1719,7 +1719,7 @@ process_coff_symbol (cs, aux)
? "enum "
: (cs->c_sclass == C_STRTAG
? "struct " : "union ")),
SYMBOL_NAME (sym));
SYMBOL_NAME (sym), NULL);
add_symbol_to_list (sym, &file_symbols);
break;
@ -1870,7 +1870,7 @@ decode_base_type (cs, c_type, aux)
/* anonymous structure type */
type = coff_alloc_type (cs->c_symnum);
TYPE_CODE (type) = TYPE_CODE_STRUCT;
TYPE_NAME (type) = concat ("struct ", "<opaque>", "");
TYPE_NAME (type) = concat ("struct ", "<opaque>", NULL);
TYPE_LENGTH (type) = 0;
TYPE_FIELDS (type) = 0;
TYPE_NFIELDS (type) = 0;
@ -1888,7 +1888,7 @@ decode_base_type (cs, c_type, aux)
{
/* anonymous union type */
type = coff_alloc_type (cs->c_symnum);
TYPE_NAME (type) = concat ("union ", "<opaque>", "");
TYPE_NAME (type) = concat ("union ", "<opaque>", NULL);
TYPE_LENGTH (type) = 0;
TYPE_FIELDS (type) = 0;
TYPE_NFIELDS (type) = 0;

View file

@ -216,7 +216,7 @@ add_show_from_set (setcmd, list)
/* Replace "set " at start of docstring with "show ". */
if (setcmd->doc[0] == 'S' && setcmd->doc[1] == 'e'
&& setcmd->doc[2] == 't' && setcmd->doc[3] == ' ')
showcmd->doc = concat ("Show ", setcmd->doc + 4, "");
showcmd->doc = concat ("Show ", setcmd->doc + 4, NULL);
else
fprintf (stderr, "GDB internal error: Bad docstring for set command\n");

View file

@ -913,7 +913,7 @@ core_file_command (filename, from_tty)
if (filename[0] == '/')
corefile = savestring (filename, strlen (filename));
else
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
printf_filtered ("Program %s ", u.u_comm);

View file

@ -112,7 +112,7 @@ core_open (filename, from_tty)
filename = tilde_expand (filename);
if (filename[0] != '/') {
temp = concat (current_directory, "/", filename);
temp = concat (current_directory, "/", filename, NULL);
free (filename);
filename = temp;
}

View file

@ -910,7 +910,7 @@ DEFUN(struct_type, (dip, thisdie, enddie),
TYPE_LENGTH (type) = dip -> at_byte_size;
tpart3 = "";
}
TYPE_NAME (type) = concat (tpart1, tpart2, tpart3);
TYPE_NAME (type) = concat (tpart1, tpart2, tpart3, NULL);
thisdie += dip -> dielength;
while (thisdie < enddie)
{
@ -1326,7 +1326,7 @@ DEFUN(enum_type, (dip), struct dieinfo *dip)
TYPE_LENGTH (type) = dip -> at_byte_size;
tpart3 = "";
}
TYPE_NAME (type) = concat (tpart1, tpart2, tpart3);
TYPE_NAME (type) = concat (tpart1, tpart2, tpart3, NULL);
if ((scan = dip -> at_element_list) != NULL)
{
(void) memcpy (&temp, scan, sizeof (temp));

View file

@ -119,7 +119,7 @@ core_file_command (filename, from_tty)
corefile = savestring (filename, strlen (filename));
else
{
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
}
set_current_frame ( create_new_frame (read_register (FP_REGNUM),

View file

@ -299,7 +299,7 @@ set_lang_str()
if (language_mode == language_mode_auto)
prefix = "auto; currently ";
language = concat(prefix, current_language->la_name, "");
language = concat(prefix, current_language->la_name, NULL);
}
void
@ -326,7 +326,7 @@ set_type_str()
error ("Unrecognized type check setting.");
}
type = concat(prefix,tmp,"");
type = concat(prefix,tmp,NULL);
}
void
@ -353,7 +353,7 @@ set_range_str()
error ("Unrecognized range check setting.");
}
range = concat(pref,tmp,"");
range = concat(pref,tmp,NULL);
}

View file

@ -266,7 +266,7 @@ core_file_command (filename, from_tty)
corefile = savestring (filename, strlen (filename));
else
{
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
}
init_tdesc();
current_context = init_dcontext();

View file

@ -342,7 +342,7 @@ core_file_command (filename, from_tty)
corefile = savestring (filename, strlen (filename));
else
{
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
}
#if 1 || defined(PYRAMID_CONTROL_FRAME_DEBUGGING)

View file

@ -292,18 +292,6 @@ savestring (ptr, size)
return p;
}
char *
concat (s1, s2, s3)
char *s1, *s2, *s3;
{
register int len = strlen (s1) + strlen (s2) + strlen (s3) + 1;
register char *val = (char *) xmalloc (len);
strcpy (val, s1);
strcat (val, s2);
strcat (val, s3);
return val;
}
void
print_spaces (n, file)
register int n;

View file

@ -194,7 +194,7 @@ core_file_command (filename, from_tty)
corefile = savestring (filename, strlen (filename));
else
{
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
}
set_current_frame ( create_new_frame (read_register (FP_REGNUM),

View file

@ -232,7 +232,7 @@ printf("u.u_tsize= %#x, u.u_dsize= %#x, u.u_ssize= %#x, stack_off= %#x\n",
corefile = savestring (filename, strlen (filename));
else
{
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
}
set_current_frame(create_new_frame(read_register(FP_REGNUM),

View file

@ -126,7 +126,7 @@ core_file_command (filename, from_tty)
corefile = savestring (filename, strlen (filename));
else
{
corefile = concat (current_directory, "/", filename);
corefile = concat (current_directory, "/", filename, NULL);
}
set_current_frame ( create_new_frame (read_register (FP_REGNUM),

View file

@ -384,7 +384,7 @@ lookup_internalvar (name)
return var;
var = (struct internalvar *) xmalloc (sizeof (struct internalvar));
var->name = concat (name, "", "");
var->name = concat (name, NULL);
var->value = allocate_value (builtin_type_void);
release_value (var->value);
var->next = internalvars;

View file

@ -825,7 +825,7 @@ process_xcoff_symbol (cs)
TYPE_NAME (ttype) = concat (
TYPE_CODE (ttype) == TYPE_CODE_UNION ? "union " :
TYPE_CODE (ttype) == TYPE_CODE_STRUCT? "struct " : "enum ",
SYMBOL_NAME (sym), "");
SYMBOL_NAME (sym), NULL);
else if (!TYPE_NAME (ttype)) /* else, regular typedef. */
TYPE_NAME (ttype) = SYMBOL_NAME (sym);