com php-src: fix base64 stuff: ext/standard/base64.c ext/standard/base64.h

From: Date: Wed, 16 Oct 2013 09:32:17 +0000
Subject: com php-src: fix base64 stuff: ext/standard/base64.c ext/standard/base64.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73511@lists.php.net to get a copy of this message
Commit: 42fdfacae682562c09e78af2f3e22879fffd54db Author: Anatol Belski <ab@php.net> Thu, 11 Jul 2013 07:02:58 -0700 Parents: 98ec9fdd51c59e8eabde065e215530077e8860e9 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=42fdfacae682562c09e78af2f3e22879fffd54db Log: fix base64 stuff Changed paths: M ext/standard/base64.c M ext/standard/base64.h Diff: diff --git a/ext/standard/base64.c b/ext/standard/base64.c index 7534c8f..8e001c5 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -53,7 +53,7 @@ static const short base64_reverse_table[256] = { }; /* }}} */ -PHPAPI unsigned char *php_base64_encode(const unsigned char *str, int length, int *ret_length) /* {{{ */ +PHPAPI unsigned char *php_base64_encode(const unsigned char *str, zend_str_size_int length, zend_str_size_int *ret_length) /* {{{ */ { const unsigned char *current = str; unsigned char *p; @@ -134,13 +134,13 @@ void php_base64_init(void) */ /* }}} */ -PHPAPI unsigned char *php_base64_decode(const unsigned char *str, int length, int *ret_length) /* {{{ */ +PHPAPI unsigned char *php_base64_decode(const unsigned char *str, zend_str_size_int length, zend_str_size_int *ret_length) /* {{{ */ { return php_base64_decode_ex(str, length, ret_length, 0); } /* }}} */ -PHPAPI unsigned char *php_base64_decode_ex(const unsigned char *str, int length, int *ret_length, zend_bool strict) /* {{{ */ +PHPAPI unsigned char *php_base64_decode_ex(const unsigned char *str, zend_str_size_int length, zend_str_size_int *ret_length, zend_bool strict) /* {{{ */ { const unsigned char *current = str; int ch, i = 0, j = 0, k; @@ -221,9 +221,9 @@ PHP_FUNCTION(base64_encode) { char *str; unsigned char *result; - int str_len, ret_length; + zend_str_size_int str_len, ret_length; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &str, &str_len) == FAILURE) { return; } result = php_base64_encode((unsigned char*)str, str_len, &ret_length); @@ -242,9 +242,9 @@ PHP_FUNCTION(base64_decode) char *str; unsigned char *result; zend_bool strict = 0; - int str_len, ret_length; + zend_str_size_int str_len, ret_length; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &str, &str_len, &strict) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|b", &str, &str_len, &strict) == FAILURE) { return; } result = php_base64_decode_ex((unsigned char*)str, str_len, &ret_length, strict); diff --git a/ext/standard/base64..h b/ext/standard/base64.h index 3f9d818..6f25fb7 100644 --- a/ext/standard/base64.h +++ b/ext/standard/base64.h @@ -24,9 +24,9 @@ PHP_FUNCTION(base64_decode); PHP_FUNCTION(base64_encode); -PHPAPI extern unsigned char *php_base64_encode(const unsigned char *, int, int *); -PHPAPI extern unsigned char *php_base64_decode_ex(const unsigned char *, int, int *, zend_bool); -PHPAPI extern unsigned char *php_base64_decode(const unsigned char *, int, int *); +PHPAPI extern unsigned char *php_base64_encode(const unsigned char *, zend_str_size_int, zend_str_size_int *); +PHPAPI extern unsigned char *php_base64_decode_ex(const unsigned char *, zend_str_size_int, zend_str_size_int *, zend_bool); +PHPAPI extern unsigned char *php_base64_decode(const unsigned char *, zend_str_size_int, zend_str_size_int *); #endif /* BASE64_H */

« previous php.cvs (#73511) next »