Skip to content

Commit

Permalink
unsigned char
Browse files Browse the repository at this point in the history
  • Loading branch information
bendailey committed Dec 2, 2015
1 parent 8a8ca00 commit 589d91c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions lib4d_sql/base64.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ static const short base64_reverse_table[256] = {

/* {{{ php_base64_encode */
//PHPAPI
unsigned char *base64_encode(const char *str, size_t length, int *ret_length)
unsigned char *base64_encode(const unsigned char *str, size_t length, int *ret_length)
{
const char *current = str;
const unsigned char *current = str;
unsigned char *p;
unsigned char *result;

Expand Down Expand Up @@ -138,17 +138,17 @@ void php_base64_init(void)
/* }}} */

//PHPAPI
unsigned char *base64_decode(const char *str, size_t length, int *ret_length)
unsigned char *base64_decode(const unsigned char *str, size_t length, int *ret_length)
{
return base64_decode_ex(str, length, ret_length, 0);
}

/* {{{ php_base64_decode */
/* as above, but backwards. :) */
//PHPAPI
unsigned char *base64_decode_ex(const char *str, size_t length, int *ret_length, int strict)
unsigned char *base64_decode_ex(const unsigned char *str, size_t length, int *ret_length, int strict)
{
const char *current = str;
const unsigned char *current = str;
int ch, i = 0, j = 0, k;
/* this sucks for threaded environments */
unsigned char *result;
Expand All @@ -164,7 +164,7 @@ unsigned char *base64_decode_ex(const char *str, size_t length, int *ret_length,
continue;
} else if (ch == -2) {
free(result);
result=NULL;
result=NULL;
return NULL;
}

Expand Down Expand Up @@ -193,7 +193,7 @@ unsigned char *base64_decode_ex(const char *str, size_t length, int *ret_length,
switch(i % 4) {
case 1:
free(result);
result=NULL;
result=NULL;
return NULL;
case 2:
k++;
Expand Down
6 changes: 3 additions & 3 deletions lib4d_sql/base64.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
//PHP_FUNCTION(base64_encode);

//PHPAPI extern
unsigned char *base64_encode(const char *, size_t, int *);
unsigned char *base64_encode(const unsigned char *, size_t, int *);
//PHPAPI extern
unsigned char *base64_decode_ex(const char *, size_t, int *, int);
unsigned char *base64_decode_ex(const unsigned char *, size_t, int *, int);
//PHPAPI extern
unsigned char *base64_decode(const char *, size_t, int *);
unsigned char *base64_decode(const unsigned char *, size_t, int *);

#endif /* BASE64_H */

Expand Down

0 comments on commit 589d91c

Please sign in to comment.