com php-src: export symbol missing by phpdbg: Zend/zend_excep tions.c Zend/zend_string.c Zend/zend_string.h

Commit: 4e338817d1b459a6e7d3e4ceb88ea25fec6024ea Author: Anatol Belski <ab@php.net> Wed, 12 Oct 2016 22:18:05 +0200 Parents: 06df34072e8b62145e3aa2abf03430ac6c5a8a80 Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e338817d1b459a6e7d3e4ceb88ea25fec6024ea Log: export symbol missing by phpdbg (cherry picked from commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1) Changed paths: M Zend/zend_exceptions.c M Zend/zend_string.c M Zend/zend_string.h Diff: diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index bff07cb..f3143b9 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -661,18 +661,6 @@ size_t zend_spprintf(char **message, size_t max_len, const char *format, ...) /* } /* }}} */ -zend_string *zend_strpprintf(size_t max_len, const char *format, ...) /* {{{ */ -{ - va_list arg; - zend_string *str; - - va_start(arg, format); - str = zend_vstrpprintf(max_len, format, arg); - va_end(arg); - return str; -} -/* }}} */ - /* {{{ proto string Exception|Error::__toString() Obtain the string representation of the Exception object */ ZEND_METHOD(exception, __toString) diff --git a/Zend/zend_string.c b/Zend/zend_string.c index 612c804..194170d 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -243,6 +243,18 @@ static void zend_interned_strings_restore_int(void) #endif } +ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...) /* {{{ */ +{ + va_list arg; + zend_string *str; + + va_start(arg, format); + str = zend_vstrpprintf(max_len, format, arg); + va_end(arg); + return str; +} +/* }}} */ + /* * Local variables: * tab-width: 4 diff --git a/Zend/zend_string.h b/Zend/zend_string.h index 8a1ac6f..1bc3c86 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -34,6 +34,8 @@ void zend_interned_strings_init(void); void zend_interned_strings_dtor(void); void zend_known_interned_strings_init(zend_string ***, uint32_t *); +ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...); + END_EXTERN_C() /* Shortcuts */