]> granicus.if.org Git - php/commitdiff
use zend_bool where zend_long isn't needed
authorAnatol Belski <ab@php.net>
Wed, 22 Oct 2014 07:07:38 +0000 (09:07 +0200)
committerAnatol Belski <ab@php.net>
Wed, 22 Oct 2014 15:56:18 +0000 (17:56 +0200)
spare at least 24 bytes per globals item on 64 bit

ext/standard/assert.c

index 65472170e25136c4e1748a7885372c3dfd42ebfc..fa5ccfc12fcaa6089bb700b37fdf21d4ad4fa91f 100644 (file)
 /* }}} */
 
 ZEND_BEGIN_MODULE_GLOBALS(assert)
-       zend_long active;
-       zend_long bail;
-       zend_long warning;
-       zend_long quiet_eval;
        zval callback;
        char *cb;
+       zend_bool active;
+       zend_bool bail;
+       zend_bool warning;
+       zend_bool quiet_eval;
 ZEND_END_MODULE_GLOBALS(assert)
 
 ZEND_DECLARE_MODULE_GLOBALS(assert)
@@ -78,11 +78,11 @@ static PHP_INI_MH(OnChangeCallback) /* {{{ */
 /* }}} */
 
 PHP_INI_BEGIN()
-        STD_PHP_INI_ENTRY("assert.active",             "1",    PHP_INI_ALL,    OnUpdateLong,           active,                         zend_assert_globals,            assert_globals)
-        STD_PHP_INI_ENTRY("assert.bail",               "0",    PHP_INI_ALL,    OnUpdateLong,           bail,                           zend_assert_globals,            assert_globals)
-        STD_PHP_INI_ENTRY("assert.warning",    "1",    PHP_INI_ALL,    OnUpdateLong,           warning,                        zend_assert_globals,            assert_globals)
+        STD_PHP_INI_ENTRY("assert.active",             "1",    PHP_INI_ALL,    OnUpdateBool,           active,                         zend_assert_globals,            assert_globals)
+        STD_PHP_INI_ENTRY("assert.bail",               "0",    PHP_INI_ALL,    OnUpdateBool,           bail,                           zend_assert_globals,            assert_globals)
+        STD_PHP_INI_ENTRY("assert.warning",    "1",    PHP_INI_ALL,    OnUpdateBool,           warning,                        zend_assert_globals,            assert_globals)
         PHP_INI_ENTRY("assert.callback",               NULL,   PHP_INI_ALL,    OnChangeCallback)
-        STD_PHP_INI_ENTRY("assert.quiet_eval", "0",    PHP_INI_ALL,    OnUpdateLong,           quiet_eval,                     zend_assert_globals,            assert_globals)
+        STD_PHP_INI_ENTRY("assert.quiet_eval", "0",    PHP_INI_ALL,    OnUpdateBool,           quiet_eval,                     zend_assert_globals,            assert_globals)
 PHP_INI_END()
 
 static void php_assert_init_globals(zend_assert_globals *assert_globals_p TSRMLS_DC) /* {{{ */
@@ -258,7 +258,7 @@ PHP_FUNCTION(assert_options)
 {
        zval *value = NULL;
        zend_long what;
-       int oldint;
+       zend_bool oldint;
        int ac = ZEND_NUM_ARGS();
        zend_string *key;