CVS shishi/gl

[shishi-commit]

Update of /home/cvs/shishi/gl
In directory dopio:/tmp/cvs-serv26482/gl

Modified Files:
        Makefile.am base64.c base64.h error.c 
Log Message:
Update.

--- /home/cvs/shishi/gl/Makefile.am     2004/12/18 16:21:13     1.55
+++ /home/cvs/shishi/gl/Makefile.am     2005/01/02 00:18:38     1.56
@@ -8,8 +8,8 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --libtool  alloca-opt allocsa base64 error extensions 
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt 
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv 
stdbool strcase strchrnul strdup strndup strnlen strtok_r timegm time_r 
timespec vasnprintf vasprintf xalloc xgetdomainname xgethostname xreadlink 
xsize xstrndup xvasprintf
+# Invoked as: gnulib-tool --import --automatic-prototypes
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --libtool  alloca-opt allocsa base64 error extensions 
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt 
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv 
size_max stdbool strcase strchrnul strdup strndup strnlen strtok_r timegm 
time_r timespec vasnprintf vasprintf xalloc xgetdomainname xgethostname 
xreadlink xsize xstrndup xvasprintf
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
--- /home/cvs/shishi/gl/base64.c        2004/12/02 01:37:50     1.3
+++ /home/cvs/shishi/gl/base64.c        2005/01/02 00:18:38     1.4
@@ -274,10 +274,10 @@
   B64 (252), B64 (253), B64 (254), B64 (255)
 };
 
-static inline bool
-isb64 (unsigned char ch)
+bool
+isbase64 (char ch)
 {
-  return ch <= 255 && 0 <= b64[ch];
+  return to_uchar (ch) <= 255 && 0 <= b64[to_uchar (ch)];
 }
 
 /* Decode base64 encoded input array IN of length INLEN to output
@@ -295,7 +295,7 @@
 
   while (inlen >= 2)
     {
-      if (!isb64 (in[0]) || !isb64 (in[1]))
+      if (!isbase64 (in[0]) || !isbase64 (in[1]))
        break;
 
       if (outleft)
@@ -319,7 +319,7 @@
        }
       else
        {
-         if (!isb64 (in[2]))
+         if (!isbase64 (in[2]))
            break;
 
          if (outleft)
@@ -339,7 +339,7 @@
            }
          else
            {
-             if (!isb64 (in[3]))
+             if (!isbase64 (in[3]))
                break;
 
              if (outleft)
--- /home/cvs/shishi/gl/base64.h        2004/12/02 01:37:50     1.2
+++ /home/cvs/shishi/gl/base64.h        2005/01/02 00:18:38     1.3
@@ -29,6 +29,8 @@
    integer >= n/k, i.e., the ceiling of n/k.  */
 #define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
 
+extern bool isbase64 (char ch);
+
 extern void base64_encode (const char *restrict in, size_t inlen,
                           char *restrict out, size_t outlen);
 
--- /home/cvs/shishi/gl/error.c 2004/10/05 18:54:41     1.7
+++ /home/cvs/shishi/gl/error.c 2005/01/02 00:18:38     1.8
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2002, 2003, 2004 Free Software Foundation, 
Inc.
+   Copyright (C) 1990-1998, 2000-2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -29,9 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef _LIBC
-# include <libintl.h>
-#else
+#if !_LIBC && ENABLE_NLS
 # include "gettext.h"
 #endif