diff options
-rw-r--r-- | Zend/zend_exceptions.c | 12 | ||||
-rw-r--r-- | Zend/zend_string.c | 12 | ||||
-rw-r--r-- | Zend/zend_string.h | 2 | ||||
-rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 2 |
4 files changed, 13 insertions, 15 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 6e4962dbf2..331213d8e6 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 194170db0b..612c8049ef 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 1bc3c86305..8a1ac6f506 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 */ diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 367d7ef93d..36d947b57f 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -543,7 +543,7 @@ int phpdbg_compile_stdin(zend_string *code) { PHPDBG_G(exec_len) = 1; { /* remove leading ?> from source */ int i; - zend_string *source_path = zend_strpprintf(0, "-%c%p", 0, PHPDBG_G(ops)->opcodes); + zend_string *source_path = strpprintf(0, "-%c%p", 0, PHPDBG_G(ops)->opcodes); phpdbg_file_source *data = zend_hash_find_ptr(&PHPDBG_G(file_sources), source_path); dtor_func_t dtor = PHPDBG_G(file_sources).pDestructor; PHPDBG_G(file_sources).pDestructor = NULL; |