Optimize out RINIT()

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 36f717085a3a21c7d15a577271ac86845e0d4238..b88dbf80fb5cbd6cf4c712b3f9875f55adbe9f62 100644 (file)
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -114,16 +114,6 @@ PHP_MSHUTDOWN_FUNCTION(assert)
        return SUCCESS;
 }
 
-PHP_RINIT_FUNCTION(assert)
-{
-       if (ASSERTG(cb)) {
-               MAKE_STD_ZVAL(ASSERTG(callback));
-               ZVAL_STRING(ASSERTG(callback), ASSERTG(cb), 1);
-       }
-
-       return SUCCESS;
-}
-
 PHP_RSHUTDOWN_FUNCTION(assert)
 {
        if (ASSERTG(callback)) { 
@@ -197,6 +187,11 @@ PHP_FUNCTION(assert)
                RETURN_TRUE;
        }
 
+       if (!ASSERTG(callback) && ASSERTG(cb)) {
+               MAKE_STD_ZVAL(ASSERTG(callback));
+               ZVAL_STRING(ASSERTG(callback), ASSERTG(cb), 1);
+       }
+
        if (ASSERTG(callback)) {
                zval *args[3];
                zval *retval;
@@ -293,6 +288,8 @@ PHP_FUNCTION(assert_options)
        case ASSERT_CALLBACK:
                if (ASSERTG(callback) != NULL) {
                        RETVAL_ZVAL(ASSERTG(callback), 1, 0);
+               } else if (ASSERTG(cb)) {
+                       RETVAL_STRING(ASSERTG(cb), 1);
                } else {
                        RETVAL_NULL();
                }

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index a79d49a8dcd4de2afd612361d682f6bd9c761e72..0a0009d1332709529a9fb60565e39117eb8ff8e7 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4132,7 +4132,6 @@ PHP_RINIT_FUNCTION(basic)
 #ifdef HAVE_SYSLOG_H
        PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU);
 #endif
-       PHP_RINIT(assert) (INIT_FUNC_ARGS_PASSTHRU);
        PHP_RINIT(dir)(INIT_FUNC_ARGS_PASSTHRU);
        PHP_RINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU);