projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inline abbrev lookup
[deliverable/binutils-gdb.git]
/
libiberty
/
concat.c
diff --git
a/libiberty/concat.c
b/libiberty/concat.c
index 4144d8305ccdc7b52d4fe90221623f31f846a008..533e4a99b0d8ced71abf8d86c8e2b6f8141c1962 100644
(file)
--- a/
libiberty/concat.c
+++ b/
libiberty/concat.c
@@
-1,5
+1,5
@@
/* Concatenate variable number of strings.
/* Concatenate variable number of strings.
- Copyright (C) 1991
, 1994, 2001, 2011
Free Software Foundation, Inc.
+ Copyright (C) 1991
-2020
Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
@@
-90,11
+90,11
@@
unsigned long
concat_length (const char *first, ...)
{
unsigned long length;
concat_length (const char *first, ...)
{
unsigned long length;
+ va_list args;
- VA_OPEN (args, first);
- VA_FIXEDARG (args, const char *, first);
+ va_start (args, first);
length = vconcat_length (first, args);
length = vconcat_length (first, args);
-
VA_CLOSE
(args);
+
va_end
(args);
return length;
}
return length;
}
@@
-105,13
+105,12
@@
char *
concat_copy (char *dst, const char *first, ...)
{
char *save_dst;
concat_copy (char *dst, const char *first, ...)
{
char *save_dst;
+ va_list args;
- VA_OPEN (args, first);
- VA_FIXEDARG (args, char *, dst);
- VA_FIXEDARG (args, const char *, first);
+ va_start (args, first);
vconcat_copy (dst, first, args);
save_dst = dst; /* With K&R C, dst goes out of scope here. */
vconcat_copy (dst, first, args);
save_dst = dst; /* With K&R C, dst goes out of scope here. */
-
VA_CLOSE
(args);
+
va_end
(args);
return save_dst;
}
return save_dst;
}
@@
-129,10
+128,10
@@
char *libiberty_concat_ptr;
char *
concat_copy2 (const char *first, ...)
{
char *
concat_copy2 (const char *first, ...)
{
-
VA_OPEN (args, first)
;
-
VA_FIXEDARG (args, const char *
, first);
+
va_list args
;
+
va_start (args
, first);
vconcat_copy (libiberty_concat_ptr, first, args);
vconcat_copy (libiberty_concat_ptr, first, args);
-
VA_CLOSE
(args);
+
va_end
(args);
return libiberty_concat_ptr;
}
return libiberty_concat_ptr;
}
@@
-141,18
+140,17
@@
char *
concat (const char *first, ...)
{
char *newstr;
concat (const char *first, ...)
{
char *newstr;
+ va_list args;
/* First compute the size of the result and get sufficient memory. */
/* First compute the size of the result and get sufficient memory. */
- VA_OPEN (args, first);
- VA_FIXEDARG (args, const char *, first);
+ va_start (args, first);
newstr = XNEWVEC (char, vconcat_length (first, args) + 1);
newstr = XNEWVEC (char, vconcat_length (first, args) + 1);
-
VA_CLOSE
(args);
+
va_end
(args);
/* Now copy the individual pieces to the result string. */
/* Now copy the individual pieces to the result string. */
- VA_OPEN (args, first);
- VA_FIXEDARG (args, const char *, first);
+ va_start (args, first);
vconcat_copy (newstr, first, args);
vconcat_copy (newstr, first, args);
-
VA_CLOSE
(args);
+
va_end
(args);
return newstr;
}
return newstr;
}
@@
-179,22
+177,19
@@
char *
reconcat (char *optr, const char *first, ...)
{
char *newstr;
reconcat (char *optr, const char *first, ...)
{
char *newstr;
+ va_list args;
/* First compute the size of the result and get sufficient memory. */
/* First compute the size of the result and get sufficient memory. */
- VA_OPEN (args, first);
- VA_FIXEDARG (args, char *, optr);
- VA_FIXEDARG (args, const char *, first);
+ va_start (args, first);
newstr = XNEWVEC (char, vconcat_length (first, args) + 1);
newstr = XNEWVEC (char, vconcat_length (first, args) + 1);
-
VA_CLOSE
(args);
+
va_end
(args);
/* Now copy the individual pieces to the result string. */
/* Now copy the individual pieces to the result string. */
- VA_OPEN (args, first);
- VA_FIXEDARG (args, char *, optr);
- VA_FIXEDARG (args, const char *, first);
+ va_start (args, first);
vconcat_copy (newstr, first, args);
if (optr) /* Done before VA_CLOSE so optr stays in scope for K&R C. */
free (optr);
vconcat_copy (newstr, first, args);
if (optr) /* Done before VA_CLOSE so optr stays in scope for K&R C. */
free (optr);
-
VA_CLOSE
(args);
+
va_end
(args);
return newstr;
}
return newstr;
}
This page took
0.02495 seconds
and
4
git commands to generate.