| Sara Golemon 2006-09-21, 6:56 pm |
| pollita Thu Sep 21 23:58:06 2006 UTC
Modified files:
/ZendEngine2 zend_API.c zend_builtin_functions.c
Log:
Add missing function protos
http://cvs.php.net/viewvc.cgi/ZendE...7&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.406 ZendEngine2/zend_API.c:1.407
--- ZendEngine2/zend_API.c:1.406 Wed Sep 20 20:30:19 2006
+++ ZendEngine2/zend_API.c Thu Sep 21 23:58:06 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.406 2006/09/20 20:30:19 andrei Exp $ */
+/* $Id: zend_API.c,v 1.407 2006/09/21 23:58:06 pollita Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -2366,11 +2366,13 @@
/* Disabled functions support */
+/* {{{ proto void display_disabled_function(void) U
+Dummy function which displays an error when a disabled function is called. */
ZEND_API ZEND_FUNCTION(display_disabled_function)
{
zend_error(E_WARNING, "%v() has been disabled for security reasons", get_active_function_name(TSRMLS_C));
}
-
+/* }}} */
static zend_function_entry disabled_function[] = {
ZEND_FE(display_disabled_function, NUL
L)
http://cvs.php.net/viewvc.cgi/ZendE...5&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.324 ZendEngine2/zend_builtin_functions.c:1.325
--- ZendEngine2/zend_builtin_functions.c:1.324 Tue Sep 19 10:38:30 2006
+++ ZendEngine2/zend_builtin_functions.c Thu Sep 21 23:58:06 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.324 2006/09/19 10:38:30 dmitry Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.325 2006/09/21 23:58:06 pollita Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -1170,12 +1170,15 @@
#ifdef ZEND_TEST_EXCEPTIONS
+/* {{{ proto void crash(void) U
+Cause the process to crash by copying data to an inaccesible location */
ZEND_FUNCTION(crash)
{
char *nowhere=NULL;
memcpy(nowhere, "something", sizeof("something"));
}
+/* }}} */
#endif
#endif /* ZEND_DEBUG */
@@ -1565,19 +1568,24 @@
#if ZEND_DEBUG
+/* {{{ proto void zend_test_func(mixed arg1, mixed arg2) U
+Generic test function */
ZEND_FUNCTION(zend_test_func)
{
zval *arg1, *arg2;
zend_get_parameters(ht, 2, &arg1, &arg2);
}
-
+/* }}} */
#ifdef ZTS
+/* {{{ proto int zend_thread_id(void) U
+Returns a unique identifier for the current thread */
ZEND_FUNCTION(zend_thread_id)
{
RETURN_LONG(tsrm_thread_id());
}
+/* }}} */
#endif
#endif
|