[GNUnet-SVN] r14171 - in libmicrohttpd: . src/daemon

[gnunet]

Author: grothoff
Date: 2011-01-14 19:20:19 +0100 (Fri, 14 Jan 2011)
New Revision: 14171

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/src/daemon/EXPORT.sym
   libmicrohttpd/src/daemon/base64.c
Log:
fixes

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2011-01-14 18:12:00 UTC (rev 14170)
+++ libmicrohttpd/ChangeLog     2011-01-14 18:20:19 UTC (rev 14171)
@@ -1,3 +1,6 @@
+Fri Jan 14 19:19:45 CET 2011
+       Removing dead code, adding missing new symbols to export list. -CG
+
 Mon Jan 10 14:07:33 CET 2011
        Releasing libmicrohttpd 0.9.5. -CG
 

Modified: libmicrohttpd/src/daemon/EXPORT.sym
===================================================================
--- libmicrohttpd/src/daemon/EXPORT.sym 2011-01-14 18:12:00 UTC (rev 14170)
+++ libmicrohttpd/src/daemon/EXPORT.sym 2011-01-14 18:20:19 UTC (rev 14171)
@@ -11,6 +11,8 @@
 MHD_create_response_from_callback
 MHD_create_response_from_data
 MHD_create_response_from_fd
+MHD_create_response_from_fd_at_offset
+MHD_create_response_from_buffer
 MHD_destroy_response
 MHD_add_response_header
 MHD_add_response_footer

Modified: libmicrohttpd/src/daemon/base64.c
===================================================================
--- libmicrohttpd/src/daemon/base64.c   2011-01-14 18:12:00 UTC (rev 14170)
+++ libmicrohttpd/src/daemon/base64.c   2011-01-14 18:20:19 UTC (rev 14171)
@@ -27,11 +27,14 @@
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
0, 0, 0,
                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
0 };
 
+#if 0
 char* BASE64Encode(const char* src) {
        unsigned int in_len = strlen(src);
-       char* dest = (char*)malloc((in_len + 2 - ((in_len + 2) % 3)) / 3 * 4 + 
1);
+       char* dest = malloc((in_len + 2 - ((in_len + 2) % 3)) / 3 * 4 + 1);
        char* result = dest;
 
+       if (dest == NULL)
+          return NULL;
        while (*src) {
                dest[0] = base64_chars[(src[0] & 0xfc) >> 2];
                dest[1] = base64_chars[((src[0] & 0x03) << 4) + ((src[1] & 
0xf0) >> 4)];
@@ -54,6 +57,7 @@
        return result;
 
 }
+#endif
 
 char* BASE64Decode(const char* src) {
        unsigned int in_len = strlen(src);