base64.c:

kent@mysql.com · kent@mysql.com · commit 3db6108cde64 · 2005-11-03T11:42:26.000+01:00
Pack ported compatibility changes from 5.1
diff --git a/mysys/base64.c b/mysys/base64.c
@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <base64.h>
-#include <m_string.h>  // strchr()
+#include <m_string.h>  /* strchr() */
 
 #ifndef MAIN
 
@@ -134,7 +134,8 @@ base64_decode(const char *src, size_t size, void *dst)
 {
   char b[3];
   size_t i= 0;
-  void *d= dst;
+  char *dst_base= (char *)dst;
+  char *d= dst_base;
   size_t j;
 
   while (i < size)
@@ -193,7 +194,7 @@ base64_decode(const char *src, size_t size, void *dst)
   {
     return -1;
   }
-  return d - dst;
+  return d - dst_base;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */`
`16`	`16`
`17`	`17`	`#include <base64.h>`
`18`		`-#include <m_string.h> // strchr()`
	`18`	`+#include <m_string.h> /* strchr() */`
`19`	`19`
`20`	`20`	`#ifndef MAIN`
`21`	`21`
`@@ -134,7 +134,8 @@ base64_decode(const char src, size_t size, void dst)`
`134`	`134`	`{`
`135`	`135`	`char b[3];`
`136`	`136`	`size_t i= 0;`
`137`		`- void *d= dst;`
	`137`	`+ char dst_base= (char )dst;`
	`138`	`+ char *d= dst_base;`
`138`	`139`	`size_t j;`
`139`	`140`
`140`	`141`	`while (i < size)`
`@@ -193,7 +194,7 @@ base64_decode(const char src, size_t size, void dst)`
`193`	`194`	`{`
`194`	`195`	`return -1;`
`195`	`196`	`}`
`196`		`- return d - dst;`
	`197`	`+ return d - dst_base;`
`197`	`198`	`}`
`198`	`199`
`199`	`200`