summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-10-13 09:50:32 +0200
committerAnatol Belski <ab@php.net>2016-10-14 02:01:08 +0200
commitee425297506cb7248085b2bfcddf264af3953d6f (patch)
treecd38a94ce841729b0b8ee6d34102e3756dda038c
parent177e6adca7349bf97c3c543fd0aea577583129cb (diff)
downloadphp-git-ee425297506cb7248085b2bfcddf264af3953d6f.tar.gz
Revert "export symbol missing by phpdbg"
This reverts commit 611ab7fe5b9fe41de56c25b1d348a866794b1fb1. Overseen strpprintf is there (cherry picked from commit 3104882cf873308c43dca20bdfd698dd3470a246)
-rw-r--r--Zend/zend_exceptions.c12
-rw-r--r--Zend/zend_string.c12
-rw-r--r--Zend/zend_string.h2
3 files changed, 12 insertions, 14 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 */