gsasl-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS gsasl/lib/gl


From: gsasl-commit
Subject: CVS gsasl/lib/gl
Date: Tue, 28 Jun 2005 11:55:42 +0200

Update of /home/cvs/gsasl/lib/gl
In directory dopio:/tmp/cvs-serv2540/gl

Modified Files:
        base64.c 
Log Message:
Update gnulib files.

--- /home/cvs/gsasl/lib/gl/base64.c     2005/06/15 10:35:28     1.13
+++ /home/cvs/gsasl/lib/gl/base64.c     2005/06/28 09:55:42     1.14
@@ -1,5 +1,5 @@
 /* base64.c -- Encode binary data using printable characters.
-   Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -65,30 +65,34 @@
 base64_encode (const char *restrict in, size_t inlen,
               char *restrict out, size_t outlen)
 {
-  const char b64[64] =
+  const char b64str[64] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
   while (inlen && outlen)
     {
-      *out++ = b64[to_uchar (in[0]) >> 2];
+      *out++ = b64str[to_uchar (in[0]) >> 2];
       if (!--outlen)
        break;
-      *out++ = b64[((to_uchar (in[0]) << 4)
-                   + (--inlen ? to_uchar (in[1]) >> 4 : 0)) & 0x3f];
+      *out++ = b64str[((to_uchar (in[0]) << 4)
+                      + (--inlen ? to_uchar (in[1]) >> 4 : 0))
+                     & 0x3f];
       if (!--outlen)
        break;
       *out++ =
        (inlen
-        ? b64[((to_uchar (in[1]) << 2)
-               + (--inlen ? to_uchar (in[2]) >> 6 : 0)) & 0x3f] : '=');
+        ? b64str[((to_uchar (in[1]) << 2)
+                  + (--inlen ? to_uchar (in[2]) >> 6 : 0))
+                 & 0x3f]
+        : '=');
       if (!--outlen)
        break;
-      *out++ = inlen ? b64[to_uchar (in[2]) & 0x3f] : '=';
+      *out++ = inlen ? b64str[to_uchar (in[2]) & 0x3f] : '=';
       if (!--outlen)
        break;
       if (inlen)
        inlen--;
-      in += 3;
+      if (inlen)
+       in += 3;
     }
 
   if (outlen)
@@ -289,7 +293,7 @@
    encountered, decoding is stopped and false is returned. */
 bool
 base64_decode (const char *restrict in, size_t inlen,
-              char *restrict out, size_t * outlen)
+              char *restrict out, size_t *outlen)
 {
   size_t outleft = *outlen;
 
@@ -376,7 +380,7 @@
    undefined. */
 bool
 base64_decode_alloc (const char *in, size_t inlen, char **out,
-                    size_t * outlen)
+                    size_t *outlen)
 {
   /* This may allocate a few bytes too much, depending on input,
      but it's not worth the extra CPU time to compute the exact amount.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]