From 411c246c6b858d91605aead2d95d21f89111d87d Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 15 Jul 2003 12:42:06 +0000
Subject: [PATCH] karl srclist envvars, vasnprintf

---
 config/srclistvars.sh | 32 ++++++++++++++++++--------------
 lib/ChangeLog         |  4 ++++
 lib/vasnprintf.c      | 12 ++++++------
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/config/srclistvars.sh b/config/srclistvars.sh
index 73f8b7c512..caaa8eeae0 100644
--- a/config/srclistvars.sh
+++ b/config/srclistvars.sh
@@ -1,4 +1,4 @@
-# $Id: srclistvars.sh,v 1.9 2003-07-14 22:44:04 eggert Exp $
+# $Id: srclistvars.sh,v 1.10 2003-07-15 12:42:06 karl Exp $
 # Variables for srclist-update and srclist.txt.
 # Will change for each user.
 
@@ -11,17 +11,21 @@ eggert)
   : ${GNUORG=../gnuorg}
   : ${LIBCSRC=../libc}
   : ${TEXINFOSRC=../texinfo}
-esac
+  ;;
+
+karl)
+  : ${ACLOCAL=/usr/local/gnu/share/aclocal}
+  : ${AUTOCONF=/usr/local/gnu/share/autoconf}
+  : ${AUTOMAKE=$HOME/gnu/src/automake}
+  : ${EMACSSRC=$HOME/gnu/src/emacs}
+  : ${GETTEXT=$HOME/gnu/src/gettext}
+  : ${GNUBIN=/usr/local/gnu/bin}
+  : ${GNUCONFIG=$HOME/gnu/src/ftp.gnu.org/pub/gnu/config}
+  : ${GNULIBSRC=$HOME/gnu/src/gnulib}
+  : ${GNUORG=$HOME/gnu/gnuorg}
+  : ${LIBCSRC=$HOME/gnu/src/libc}
+  : ${TEXINFOSRC=/u/texinfo/src}
+  : ${TEXMFROOT=/usr/local/texmf/texmf}
+  ;;
 
-: ${ACLOCAL=/usr/local/gnu/share/aclocal}
-: ${AUTOCONF=/usr/local/gnu/share/autoconf}
-: ${AUTOMAKE=$HOME/gnu/src/automake}
-: ${EMACSSRC=$HOME/gnu/src/emacs}
-: ${GETTEXT=/usr/local/gnu/share/gettext}
-: ${GNUBIN=/usr/local/gnu/bin}
-: ${GNUCONFIG=$HOME/gnu/src/ftp.gnu.org/pub/gnu/config}
-: ${GNULIBSRC=$HOME/gnu/src/gnulib}
-: ${GNUORG=$HOME/gnu/gnuorg}
-: ${LIBCSRC=$HOME/gnu/src/libc}
-: ${TEXINFOSRC=/u/texinfo/src}
-: ${TEXMFROOT=/usr/local/texmf/texmf}
+esac
diff --git a/lib/ChangeLog b/lib/ChangeLog
index ba97b7d5eb..5f395ece24 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-15    <karl@gnu.org>
+
+	* vasnprintf.c: update from gettext.
+
 2003-07-15  Jim Meyering  <jim@meyering.net>
 
 	* makepath.c (make_path): Enclose diagnostic in _(...).
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 29e601f0b5..994f993483 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -39,12 +39,12 @@
 #include "printf-parse.h"
 
 /* For those losing systems which don't have 'alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
+   some additional code emulating it.  */ 
+#ifdef HAVE_ALLOCA 
 # define freea(p) /* nothing */
 #else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
+# define alloca(n) malloc (n) 
+# define freea(p) free (p) 
 #endif
 
 char *
@@ -509,7 +509,7 @@ vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
 		    retcount = 0;
 
 #if HAVE_SNPRINTF
-# define SNPRINTF_BUF(arg) \
+#define SNPRINTF_BUF(arg) \
 		    switch (prefix_count)				    \
 		      {							    \
 		      case 0:						    \
@@ -529,7 +529,7 @@ vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
 			abort ();					    \
 		      }
 #else
-# define SNPRINTF_BUF(arg) \
+#define SNPRINTF_BUF(arg) \
 		    switch (prefix_count)				    \
 		      {							    \
 		      case 0:						    \
-- 
2.30.2