com php-src: Revert "export symbol missing by phpdbg": Zend/zend_exceptions.c Zend/zend_string.c Zend/zend _string.h

Commit: ee425297506cb7248085b2bfcddf264af3953d6f Author: Anatol Belski <ab@php.net> Thu, 13 Oct 2016 09:50:32 +0200 Parents: 177e6adca7349bf97c3c543fd0aea577583129cb Branches: PHP-7.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ee425297506cb7248085b2bfcddf264af3953d6f Log: Revert "export symbol missing by phpdbg" This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1. Overseen strpprintf is there (cherry picked from commit 3104882cf873308c43dca20bdfd698dd3470a246) 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 6e4962d..331213d 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -661,6 +661,18 @@ 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 194170d..612c804 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -243,18 +243,6 @@ 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 1bc3c86..8a1ac6f 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -34,8 +34,6 @@ 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 */