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

convert to use of variable arg count concat() in libiberty.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3109a7b824b4e896c9a19f80fc8c5922f1937716..d857fcfbe7807fe19ef4cc1238b20c23fea07c87 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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.

diff --git a/gdb/altos-xdep.c b/gdb/altos-xdep.c
index fbc289bccbe446355235eae353b2b2d4bbbdcd9c..8cbdfc9a0d9ad57ecaf2d0e11143942616c67064 100644 (file)
--- a/gdb/altos-xdep.c
+++ b/gdb/altos-xdep.c
@@ -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),

diff --git a/gdb/arm-xdep.c b/gdb/arm-xdep.c
index 885d3bbe224aae54a1a683be633fc6d921823ae7..e03e16d3bf142b72fc8df7a8225bbc97214b0c67 100644 (file)
--- a/gdb/arm-xdep.c
+++ b/gdb/arm-xdep.c
@@ -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),

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 11aaf5077a5d060c59e9ab0b2247860a412daf94..f42f22b1f6106ef731cbe4ffd27eaa66fa52a0e9 100644 (file)
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -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;

diff --git a/gdb/command.c b/gdb/command.c
index a1ce588c224585955f28636c45d9f171f1d19bf0..d8839401cd227b8972f06383ba127457d82a0518 100644 (file)
--- a/gdb/command.c
+++ b/gdb/command.c
@@ -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");
   

diff --git a/gdb/convex-xdep.c b/gdb/convex-xdep.c
index 57646abb6701679db1f8cf393533cc765f13bfd4..bfce6ebd6f625e6d698248a7993756de95c1ed35 100644 (file)
--- a/gdb/convex-xdep.c
+++ b/gdb/convex-xdep.c
@@ -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);
 

diff --git a/gdb/core.c b/gdb/core.c
index 8ff3119bb3b99ed55946ceb49742b2c8494ff138..8b6895d323c113a73a3b71649cf34552fa3b9660 100644 (file)
--- a/gdb/core.c
+++ b/gdb/core.c
@@ -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;
   }

diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index 546c25edd25628b8d669ed597826795f66ad3463..0201945afc5294566e7efcf81babc20af4ea85b7 100644 (file)
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -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));

diff --git a/gdb/gould-xdep.c b/gdb/gould-xdep.c
index 36d6b20412fe2f40a7818fa5532e0860e918fc8f..bd6276dbb50ffd39829cb269449aec12bd6a41c3 100644 (file)
--- a/gdb/gould-xdep.c
+++ b/gdb/gould-xdep.c
@@ -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),

diff --git a/gdb/language.c b/gdb/language.c
index 76509fc5b8b1829f22c5b3d923fb5a05226c4b47..2ddad677a14873e8df542bb2467454318de96288 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -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);
 }
 
 

diff --git a/gdb/m88k-xdep.c b/gdb/m88k-xdep.c
index 5ecd12df306b8bad39759e252b1b2c10b018908c..835d8a229f22b0f999cc8e3727b6cc75a8c3223d 100644 (file)
--- a/gdb/m88k-xdep.c
+++ b/gdb/m88k-xdep.c
@@ -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();

diff --git a/gdb/pyr-xdep.c b/gdb/pyr-xdep.c
index 85b1c58a7aa76b322c46c02b2d8bb595ff145434..4a89db9498e874fe63880467ab6ae90171e1d36d 100644 (file)
--- a/gdb/pyr-xdep.c
+++ b/gdb/pyr-xdep.c
@@ -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)

diff --git a/gdb/rem-multi.shar b/gdb/rem-multi.shar
index 51ac56c7eeaba706eed6894c628eca3c1f9c7fad..110e060a879021398fc9479734c5b3a66a450ced 100644 (file)
--- a/gdb/rem-multi.shar
+++ b/gdb/rem-multi.shar
@@ -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;

diff --git a/gdb/sun386-xdep.c b/gdb/sun386-xdep.c
index b5bdbd212cf29cd434728bb315325fe51c8ca885..4ecb54223c61c04b6fd6e8b8e5f29acf0e07558c 100644 (file)
--- a/gdb/sun386-xdep.c
+++ b/gdb/sun386-xdep.c
@@ -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),

diff --git a/gdb/symm-xdep.c b/gdb/symm-xdep.c
index 409476a5d718f5a6f5af38fc27708cc8f8b539d1..28713079aeec0d59a8cd0251528763cb8b1cb8cc 100644 (file)
--- a/gdb/symm-xdep.c
+++ b/gdb/symm-xdep.c
@@ -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),

diff --git a/gdb/umax-xdep.c b/gdb/umax-xdep.c
index 3406bdec806458a8f0da13584a8e391cb0ea81c9..81183766bb06d3941abd3b79ee8f5474e793558f 100644 (file)
--- a/gdb/umax-xdep.c
+++ b/gdb/umax-xdep.c
@@ -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),

diff --git a/gdb/values.c b/gdb/values.c
index a7f959e4376658426c4bb73b1a22eee694e9d5f4..eac4d59096eb0b6ab4579777f841af85dad4edaf 100644 (file)
--- a/gdb/values.c
+++ b/gdb/values.c
@@ -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;

diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index d3d07cab1d49f3a9b9a66cdb123109fdc78cd8af..912c9d11ae935fe897d4a54181174bb817f0c2e0 100644 (file)
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -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);