From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 24 May 2004 18:12:23 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~444
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=623281e06d11c94ceebd9397dc18fb9f596c7080;p=thirdparty%2Fglibc.git

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>.
---

diff --git a/ChangeLog b/ChangeLog
index 96216a91171..9605545b107 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 8494799f547..344c360efb6 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 *))