* error.c (error_tail): Move some declarations

into inner scope where the local variables are used.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 987ae0a58d9b0a3c24738bc1b403094e613e72c0..dea641cd04e745912977dea2adea979641067a6b 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-26  Jim Meyering  <jim@meyering.net>
+
+       * error.c (error_tail): Move some declarations
+       into inner scope where the local variables are used.
+
 2003-09-26  Bruno Haible  <bruno@clisp.org>
 
        * stpncpy.h (gnu_stpncpy): New declaration.
@@ -8,10 +13,13 @@
 
        * error.c (SIZE_MAX) [!defined SIZE_MAX]: Define.
        (error_tail): Do not loop, reallocating temporary buffer, since
-       the original size is big enough.  This avoids one potential size
-       overflow calculation.  Check for size overflow when calculating
-       temporary buffer size.  Free temporary buffer when done, if
-       it was allocated with malloc; this closes a memory leak.
+       the output cannot contain more wide characters than the input
+       contains bytes, the size must be big enough already.  This avoids
+       one potential size overflow calculation.  Check for size overflow
+       when calculating temporary buffer size.  Free temporary buffer
+       when done, if it was allocated with malloc; this plugs a memory
+       leak.  Remove casts from void * to pointers, that are no longer
+       needed now that we're assuming C89 or better.
 
        Merge error changes from glibc.
 

diff --git a/lib/error.c b/lib/error.c
index 1c74a14febc0311b6e913b45ba005af904c22070..16228c413ebcd9ea62e895588911391f7ccac11a 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -147,9 +147,6 @@ error_tail (int status, int errnum, const char *message, va_list args)
 # define ALLOCA_LIMIT 2000
       size_t len = strlen (message) + 1;
       const wchar_t *wmessage = L"out of memory";
-      mbstate_t st;
-      size_t res;
-      const char *tmp;
       wchar_t *wbuf = (len < ALLOCA_LIMIT
                       ? (void *) alloca (len * sizeof *wbuf)
                       : len <= SIZE_MAX / sizeof *wbuf
@@ -158,8 +155,10 @@ error_tail (int status, int errnum, const char *message, va_list args)
 
       if (wbuf)
        {
+         size_t res;
+         mbstate_t st;
+         const char *tmp = message;
          memset (&st, '\0', sizeof (st));
-         tmp =message;
          res = mbsrtowcs (wbuf, &tmp, len, &st);
          wmessage = res == (size_t) -1 ? L"???" : wbuf;
        }