PR 10980

[deliverable/binutils-gdb.git] / libiberty / concat.c

diff --git a/libiberty/concat.c b/libiberty/concat.c
index cf026cf8f4cc1efeab9a4f5ab2f8d8b39e9df977..1f329ea0e15d69689a962dc9b16fe5152259a944 100644 (file)
--- a/libiberty/concat.c
+++ b/libiberty/concat.c
@@ -15,30 +15,20 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If

-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 
 /*
 
 
 
 /*
 

-NAME
+@deftypefn Extension char* concat (const char *@var{s1}, const char *@var{s2}, @dots{}, @code{NULL})

 
 

-       concat -- concatenate a variable number of strings
+Concatenate zero or more of strings and return the result in freshly
+@code{xmalloc}ed memory.  Returns @code{NULL} if insufficient memory is
+available.  The argument list is terminated by the first @code{NULL}
+pointer encountered.  Pointers to empty strings are ignored.

 
 

-SYNOPSIS
-
-       #include <varargs.h>
-
-       char *concat (s1, s2, s3, ..., NULL)
-
-DESCRIPTION
-
-       Concatenate a variable number of strings and return the result
-       in freshly malloc'd memory.
-
-       Returns NULL if insufficient memory is available.  The argument
-       list is terminated by the first NULL pointer encountered.  Pointers
-       to empty strings are ignored.
+@end deftypefn

 
 NOTES
 
 
 NOTES
 


@@ -50,6 +40,7 @@ NOTES
        deal with low memory situations itself, it should supply an xmalloc
        that just directly invokes malloc and blindly returns whatever
        malloc returns.
        deal with low memory situations itself, it should supply an xmalloc
        that just directly invokes malloc and blindly returns whatever
        malloc returns.

+

 */
 
 
 */
 
 


@@ -60,11 +51,7 @@ NOTES
 #include "libiberty.h"
 #include <sys/types.h>         /* size_t */
 
 #include "libiberty.h"
 #include <sys/types.h>         /* size_t */
 

-#ifdef ANSI_PROTOTYPES

 #include <stdarg.h>
 #include <stdarg.h>

-#else
-#include <varargs.h>
-#endif

 
 # if HAVE_STRING_H
 #  include <string.h>
 
 # if HAVE_STRING_H
 #  include <string.h>


@@ -74,11 +61,13 @@ NOTES
 #  endif
 # endif
 
 #  endif
 # endif
 

-static inline unsigned long vconcat_length PARAMS ((const char *, va_list));
+#if HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+static inline unsigned long vconcat_length (const char *, va_list);

 static inline unsigned long
 static inline unsigned long

-vconcat_length (first, args)
-     const char *first;
-     va_list args;
+vconcat_length (const char *first, va_list args)

 {
   unsigned long length = 0;
   const char *arg;
 {
   unsigned long length = 0;
   const char *arg;


@@ -89,12 +78,8 @@ vconcat_length (first, args)
   return length;
 }
 
   return length;
 }
 

-static inline char *vconcat_copy PARAMS ((char *, const char *, va_list));

 static inline char *
 static inline char *

-vconcat_copy (dst, first, args)
-     char *dst;
-     const char *first;
-     va_list args;
+vconcat_copy (char *dst, const char *first, va_list args)

 {
   char *end = dst;
   const char *arg;
 {
   char *end = dst;
   const char *arg;


@@ -110,8 +95,10 @@ vconcat_copy (dst, first, args)
   return dst;
 }
 
   return dst;
 }
 

+/* @undocumented concat_length */
+

 unsigned long
 unsigned long

-concat_length VPARAMS ((const char *first, ...))
+concat_length (const char *first, ...)

 {
   unsigned long length;
 
 {
   unsigned long length;
 


@@ -123,8 +110,10 @@ concat_length VPARAMS ((const char *first, ...))
   return length;
 }
 
   return length;
 }
 

+/* @undocumented concat_copy */
+

 char *
 char *

-concat_copy VPARAMS ((char *dst, const char *first, ...))
+concat_copy (char *dst, const char *first, ...)

 {
   char *save_dst;
 
 {
   char *save_dst;
 


@@ -138,10 +127,18 @@ concat_copy VPARAMS ((char *dst, const char *first, ...))
   return save_dst;
 }
 
   return save_dst;
 }
 

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */

 char *libiberty_concat_ptr;
 char *libiberty_concat_ptr;

+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+/* @undocumented concat_copy2 */

 
 char *
 
 char *

-concat_copy2 VPARAMS ((const char *first, ...))
+concat_copy2 (const char *first, ...)

 {
   VA_OPEN (args, first);
   VA_FIXEDARG (args, const char *, first);
 {
   VA_OPEN (args, first);
   VA_FIXEDARG (args, const char *, first);


@@ -152,14 +149,14 @@ concat_copy2 VPARAMS ((const char *first, ...))
 }
 
 char *
 }
 
 char *

-concat VPARAMS ((const char *first, ...))
+concat (const char *first, ...)

 {
   char *newstr;
 
   /* First compute the size of the result and get sufficient memory.  */
   VA_OPEN (args, first);
   VA_FIXEDARG (args, const char *, first);
 {
   char *newstr;
 
   /* First compute the size of the result and get sufficient memory.  */
   VA_OPEN (args, first);
   VA_FIXEDARG (args, const char *, first);

-  newstr = (char *) xmalloc (vconcat_length (first, args) + 1);
+  newstr = XNEWVEC (char, vconcat_length (first, args) + 1);

   VA_CLOSE (args);
 
   /* Now copy the individual pieces to the result string. */
   VA_CLOSE (args);
 
   /* Now copy the individual pieces to the result string. */


@@ -171,8 +168,25 @@ concat VPARAMS ((const char *first, ...))
   return newstr;
 }
 
   return newstr;
 }
 

+/*
+
+@deftypefn Extension char* reconcat (char *@var{optr}, const char *@var{s1}, @dots{}, @code{NULL})
+
+Same as @code{concat}, except that if @var{optr} is not @code{NULL} it
+is freed after the string is created.  This is intended to be useful
+when you're extending an existing string or building up a string in a
+loop:
+
+@example
+  str = reconcat (str, "pre-", str, NULL);
+@end example
+
+@end deftypefn
+
+*/
+

 char *
 char *

-reconcat VPARAMS ((char *optr, const char *first, ...))
+reconcat (char *optr, const char *first, ...)

 {
   char *newstr;
 
 {
   char *newstr;
 


@@ -180,7 +194,7 @@ reconcat VPARAMS ((char *optr, const char *first, ...))
   VA_OPEN (args, first);
   VA_FIXEDARG (args, char *, optr);
   VA_FIXEDARG (args, const char *, first);
   VA_OPEN (args, first);
   VA_FIXEDARG (args, char *, optr);
   VA_FIXEDARG (args, const char *, first);

-  newstr = (char *) xmalloc (vconcat_length (first, args) + 1);
+  newstr = XNEWVEC (char, vconcat_length (first, args) + 1);

   VA_CLOSE (args);
 
   /* Now copy the individual pieces to the result string. */
   VA_CLOSE (args);
 
   /* Now copy the individual pieces to the result string. */


@@ -203,7 +217,7 @@ reconcat VPARAMS ((char *optr, const char *first, ...))
 #include <stdio.h>
 
 int
 #include <stdio.h>
 
 int

-main ()
+main (void)

 {
   printf ("\"\" = \"%s\"\n", concat (NULLP));
   printf ("\"a\" = \"%s\"\n", concat ("a", NULLP));
 {
   printf ("\"\" = \"%s\"\n", concat (NULLP));
   printf ("\"a\" = \"%s\"\n", concat ("a", NULLP));