Skip to content

Commit 3104882

Browse files
committed
Revert "export symbol missing by phpdbg"
This reverts commit 611ab7f. Overseen strpprintf is there
1 parent cd8c9b0 commit 3104882

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

Zend/zend_exceptions.c

+12
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,18 @@ size_t zend_spprintf(char **message, size_t max_len, const char *format, ...) /*
696696
}
697697
/* }}} */
698698

699+
zend_string *zend_strpprintf(size_t max_len, const char *format, ...) /* {{{ */
700+
{
701+
va_list arg;
702+
zend_string *str;
703+
704+
va_start(arg, format);
705+
str = zend_vstrpprintf(max_len, format, arg);
706+
va_end(arg);
707+
return str;
708+
}
709+
/* }}} */
710+
699711
/* {{{ proto string Exception|Error::__toString()
700712
Obtain the string representation of the Exception object */
701713
ZEND_METHOD(exception, __toString)

Zend/zend_string.c

-12
Original file line numberDiff line numberDiff line change
@@ -198,18 +198,6 @@ static void zend_interned_strings_restore_int(void)
198198
#endif
199199
}
200200

201-
ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...) /* {{{ */
202-
{
203-
va_list arg;
204-
zend_string *str;
205-
206-
va_start(arg, format);
207-
str = zend_vstrpprintf(max_len, format, arg);
208-
va_end(arg);
209-
return str;
210-
}
211-
/* }}} */
212-
213201
/*
214202
* Local variables:
215203
* tab-width: 4

Zend/zend_string.h

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ ZEND_API zend_ulong zend_hash_func(const char *str, size_t len);
3333
void zend_interned_strings_init(void);
3434
void zend_interned_strings_dtor(void);
3535

36-
ZEND_API zend_string *zend_strpprintf(size_t max_len, const char *format, ...);
37-
3836
END_EXTERN_C()
3937

4038
/* Shortcuts */

0 commit comments

Comments
 (0)