aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-05-24 18:12:23 +0000
committerUlrich Drepper <drepper@redhat.com>2004-05-24 18:12:23 +0000
commit623281e06d11c94ceebd9397dc18fb9f596c7080 (patch)
tree391c1d989e25129100c54abd53adcfb632a90146
parent75c827b5e1d1d6a47fdb49ec4ab6e5293910841b (diff)
downloadglibc-623281e06d11c94ceebd9397dc18fb9f596c7080.tar
glibc-623281e06d11c94ceebd9397dc18fb9f596c7080.tar.gz
glibc-623281e06d11c94ceebd9397dc18fb9f596c7080.tar.bz2
glibc-623281e06d11c94ceebd9397dc18fb9f596c7080.zip
Update.
2004-05-24 Ulrich Drepper <drepper@redhat.com> * manual/string.texi (Copying and Concatenation): Fixed second concat example. Reported by Fabian Pietsch <fabian@zzznowman.dyndns.org>.
-rw-r--r--ChangeLog6
-rw-r--r--manual/string.texi6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 96216a9117..9605545b10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-24 Ulrich Drepper <drepper@redhat.com>
+
+ * manual/string.texi (Copying and Concatenation): Fixed second
+ concat example.
+ Reported by Fabian Pietsch <fabian@zzznowman.dyndns.org>.
+
2004-05-23 Ulrich Drepper <drepper@redhat.com>
* malloc/obstack.c: Don't allow linking with _obstack.
diff --git a/manual/string.texi b/manual/string.texi
index 8494799f54..344c360efb 100644
--- a/manual/string.texi
+++ b/manual/string.texi
@@ -880,13 +880,13 @@ concat (const char *str, @dots{})
va_list ap;
size_t allocated = 100;
char *result = (char *) malloc (allocated);
- char *wp;
- if (allocated != NULL)
+ if (result != NULL)
@{
char *newp;
+ char *wp;
- va_start (ap, atr);
+ va_start (ap, str);
wp = result;
for (s = str; s != NULL; s = va_arg (ap, const char *))