* Changed decode_base64() to CtdlDecodeBase64() to avoid conflict with

[citadel.git] / webcit / cookie_conversion.c

diff --git a/webcit/cookie_conversion.c b/webcit/cookie_conversion.c
index d0bec8b521ef4a10bbc0f603276625536d3b02c2..b9db3f90969588d5393e542a44be70daad830fea 100644 (file)
--- a/webcit/cookie_conversion.c
+++ b/webcit/cookie_conversion.c
@@ -27,7 +27,7 @@ typedef unsigned char byte;         /* Byte type */
 static byte dtable[SIZ];             /* base64 encode / decode table */
 
 /*
- * decode_base64() and encode_base64() are adaptations of code by
+ * CtdlDecodeBase64() and encode_base64() are adaptations of code by
  * John Walker, found in full in the file "base64.c" included with the Citadel
  * server.  The difference between those functions and these is that
  * these are intended to encode/decode small string buffers, and those are
@@ -94,7 +94,7 @@ void encode_base64(char *dest, char *source)
  * Convert base64-encoded to binary.  Returns the length of the decoded data.
  * It will stop after reading 'length' bytes.
  */
-int decode_base64(char *dest, char *source, size_t length)
+int CtdlDecodeBase64(char *dest, char *source, size_t length)
 {
     int i, c;
     int dpos = 0;
@@ -175,7 +175,7 @@ void cookie_to_stuff(char *cookie, int *session, char *user, char *pass, char *r
 {
        char buf[SIZ];
 
-       decode_base64(buf, cookie, strlen(cookie));
+       CtdlDecodeBase64(buf, cookie, strlen(cookie));
 
        if (session != NULL)
                *session = extract_int(buf, 0);