Imported Upstream version 2.6.1

[debian/amanda] / gnulib / base64.c

diff --git a/gnulib/base64.c b/gnulib/base64.c
index f237cd63b4f6c7d77cccf2e1cb4eb28b82510fbd..188b36ac73d1fc4505634584f650a26f7b4e6d98 100644 (file)
--- a/gnulib/base64.c
+++ b/gnulib/base64.c
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -64,8 +64,8 @@ to_uchar (char ch)
    possible.  If OUTLEN is larger than BASE64_LENGTH(INLEN), also zero
    terminate the output buffer. */
 void
    possible.  If OUTLEN is larger than BASE64_LENGTH(INLEN), also zero
    terminate the output buffer. */
 void

-base64_encode (const char *restrict in, size_t inlen,
-              char *restrict out, size_t outlen)
+base64_encode (const char *in, size_t inlen,
+              char *out, size_t outlen)

 {
   static const char b64str[64] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 {
   static const char b64str[64] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";


@@ -310,8 +310,8 @@ isbase64 (char ch)
    that, when applicable, you must remove any line terminators that is
    part of the data stream before calling this function.  */
 bool
    that, when applicable, you must remove any line terminators that is
    part of the data stream before calling this function.  */
 bool

-base64_decode (const char *restrict in, size_t inlen,
-              char *restrict out, size_t *outlen)
+base64_decode (const char *in, size_t inlen,
+              char *out, size_t *outlen)

 {
   size_t outleft = *outlen;
 
 {
   size_t outleft = *outlen;