Merge commit 'upstream/3.2.0'

[debian/amanda] / gnulib / base64.h

diff --git a/gnulib/base64.h b/gnulib/base64.h
index 9c31651e4c801c6e796bfd73e5918767e0a77cd4..2be394bdade0594b260214543c672c26ffc6c63f 100644 (file)
--- a/gnulib/base64.h
+++ b/gnulib/base64.h
@@ -1,10 +1,10 @@
 /* base64.h -- Encode binary data using printable characters.
 /* base64.h -- Encode binary data using printable characters.

-   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.

    Written by Simon Josefsson.
 
    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
    Written by Simon Josefsson.
 
    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,


@@ -38,24 +38,24 @@ struct base64_decode_context
 extern bool isbase64 (char ch);
 
 extern void base64_encode (const char *restrict in, size_t inlen,
 extern bool isbase64 (char ch);
 
 extern void base64_encode (const char *restrict in, size_t inlen,

-                          char *restrict out, size_t outlen);
+                           char *restrict out, size_t outlen);

 
 extern size_t base64_encode_alloc (const char *in, size_t inlen, char **out);
 
 extern void base64_decode_ctx_init (struct base64_decode_context *ctx);
 
 extern bool base64_decode_ctx (struct base64_decode_context *ctx,
 
 extern size_t base64_encode_alloc (const char *in, size_t inlen, char **out);
 
 extern void base64_decode_ctx_init (struct base64_decode_context *ctx);
 
 extern bool base64_decode_ctx (struct base64_decode_context *ctx,

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

 
 extern bool base64_decode_alloc_ctx (struct base64_decode_context *ctx,
 
 extern bool base64_decode_alloc_ctx (struct base64_decode_context *ctx,

-                                    const char *in, size_t inlen,
-                                    char **out, size_t *outlen);
+                                     const char *in, size_t inlen,
+                                     char **out, size_t *outlen);

 
 #define base64_decode(in, inlen, out, outlen) \
 
 #define base64_decode(in, inlen, out, outlen) \

-       base64_decode_ctx (NULL, in, inlen, out, outlen)
+        base64_decode_ctx (NULL, in, inlen, out, outlen)

 
 #define base64_decode_alloc(in, inlen, out, outlen) \
 
 #define base64_decode_alloc(in, inlen, out, outlen) \

-       base64_decode_alloc_ctx (NULL, in, inlen, out, outlen)
+        base64_decode_alloc_ctx (NULL, in, inlen, out, outlen)

 
 #endif /* BASE64_H */
 
 #endif /* BASE64_H */