Commit 00d7c5f4 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0
parents 1ddb06fc 4ef11781

mysys/base64.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

  unsigned char *d= (unsigned char*)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 - (unsigned char*)dst;

  return d - dst_base;

}