com php-src: Provide zend_string wrappers for php_bas e64_(en|de)code: ext/standard/base64.c ext/standard/base64.h main/php.h

Commit: 3de82a0349b3c4942690c9b04d6e4a7ecdca2da9 Author: Sara Golemon <pollita@php.net> Sat, 15 Jul 2017 07:51:49 -0400 Parents: 90ae2aec8c454020a7e658c98e8fc39496dc2393 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3de82a0349b3c4942690c9b04d6e4a7ecdca2da9 Log: Provide zend_string wrappers for php_base64_(en|de)code Also pull existing php_base64_decode() proxy out to an inline. Bump PHP_API_VERSION for ABI change. Changed paths: M ext/standard/base64.c M ext/standard/base64.h M main/php.h Diff: diff --git a/ext/standard/base64.c b/ext/standard/base64.c index 5ba69c4..4a4cbe1 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -127,12 +127,6 @@ void php_base64_init(void) */ /* }}} */ -PHPAPI zend_string *php_base64_decode(const unsigned char *str, size_t length) /* {{{ */ -{ - return php_base64_decode_ex(str, length, 0); -} -/* }}} */ - PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, zend_bool strict) /* {{{ */ { const unsigned char *current = str; diff --git a/ext/standard/base64.h b/ext/standard/base64.h index 77d2da9..1fa901b 100644 --- a/ext/standard/base64.h +++ b/ext/standard/base64.h @@ -25,8 +25,18 @@ PHP_FUNCTION(base64_decode); PHP_FUNCTION(base64_encode); PHPAPI extern zend_string *php_base64_encode(const unsigned char *, size_t); +static inline zend_string *php_base64_encode_str(const zend_string *str) { + return php_base64_encode((const unsigned char*)(ZSTR_VAL(str)), ZSTR_LEN(str)); +} + PHPAPI extern zend_string *php_base64_decode_ex(const unsigned char *, size_t, zend_bool); -PHPAPI extern zend_string *php_base64_decode(const unsigned char *, size_t); + +static inline zend_string *php_base64_decode(const unsigned char *str, size_t len) { + return php_base64_decode_ex(str, len, 0); +} +static inline zend_string *php_base64_decode_str(const zend_string *str) { + return php_base64_decode_ex((const unsigned char*)(ZSTR_VAL(str)), ZSTR_LEN(str), 0); +} #endif /* BASE64_H */ diff --git a/main/php.h b/main/php.h index 53926d2..edf810d 100644 --- a/main/php.h +++ b/main/php.h @@ -26,7 +26,7 @@ #include <dmalloc.h> #endif -#define PHP_API_VERSION 20160731 +#define PHP_API_VERSION 20170715 #define PHP_HAVE_STREAMS #define YYDEBUG 0 #define PHP_DEFAULT_CHARSET "UTF-8"