com php-src: export symbol missing by phpdbg: Zend/zend_excep tions.c Zend/zend_string.c Zend/zend_string.h
| From: | Anatol Belski | Date: | Wed, 12 Oct 2016 20:18:41 +0000 |
| Subject: | com php-src: export symbol missing by phpdbg: Zend/zend_excep tions.c Zend/zend_string.c Zend/zend_string.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94972@lists.php.net to get a copy of this message | ||
Commit: 611ab7fe5b9fe41de56c25b1d348a866794b1fb1
Author: Anatol Belski <ab@php.net> Wed, 12 Oct 2016 22:18:05 +0200
Parents: 671d8054f85d2dec1a00201a73ab792847c13919
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=611ab7fe5b9fe41de56c25b1d348a866794b1fb1
Log:
export symbol missing by phpdbg
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 89c94eb..388c982 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -696,18 +696,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 03d77e1..39912da 100644
--- a/Zend/zend_string.c
+++ b/Zend/zend_string.c
@@ -198,6 +198,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 722fc3a..a1c1beb 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -33,6 +33,8 @@ ZEND_API zend_ulong zend_hash_func(const char *str, size_t len);
void zend_interned_strings_init(void);
void zend_interned_strings_dtor(void);
+ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ....);
+
END_EXTERN_C()
/* Shortcuts */