aboutsummaryrefslogtreecommitdiff
path: root/libiberty/concat.c
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2001-10-16 02:55:31 +0000
committerDJ Delorie <dj@redhat.com>2001-10-16 02:55:31 +0000
commitba19b94f67aeec0722939ce17b4067c8fd05f4cc (patch)
treedb034680b326cb43083236abf9737518d7e1c78a /libiberty/concat.c
parenta3366758ce10f5bc06f1a128c4eb82cf2a82e455 (diff)
downloadgdb-ba19b94f67aeec0722939ce17b4067c8fd05f4cc.zip
gdb-ba19b94f67aeec0722939ce17b4067c8fd05f4cc.tar.gz
gdb-ba19b94f67aeec0722939ce17b4067c8fd05f4cc.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty/concat.c')
-rw-r--r--libiberty/concat.c46
1 files changed, 30 insertions, 16 deletions
diff --git a/libiberty/concat.c b/libiberty/concat.c
index fbbf2ee..a7e6428 100644
--- a/libiberty/concat.c
+++ b/libiberty/concat.c
@@ -21,24 +21,14 @@ Boston, MA 02111-1307, USA. */
/*
-NAME
+@deftypefn Extension char* concat (char *@var{s1}, char *@var{s2}, ..., @code{NULL})
- concat -- concatenate a variable number of strings
+Concatenate zero or more of strings and return the result in freshly
+xmalloc'd 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
@@ -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.
+
*/
@@ -114,6 +105,8 @@ vconcat_copy (dst, first, args)
return dst;
}
+/* @undocumented concat_length */
+
unsigned long
concat_length VPARAMS ((const char *first, ...))
{
@@ -127,6 +120,8 @@ concat_length VPARAMS ((const char *first, ...))
return length;
}
+/* @undocumented concat_copy */
+
char *
concat_copy VPARAMS ((char *dst, const char *first, ...))
{
@@ -144,6 +139,8 @@ concat_copy VPARAMS ((char *dst, const char *first, ...))
char *libiberty_concat_ptr;
+/* @undocumented concat_copy2 */
+
char *
concat_copy2 VPARAMS ((const char *first, ...))
{
@@ -175,6 +172,23 @@ concat VPARAMS ((const char *first, ...))
return newstr;
}
+/*
+
+@deftypefn Extension char* reconcat (char *@var{optr}, char *@var{s1}, ..., @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 *
reconcat VPARAMS ((char *optr, const char *first, ...))
{