From 7aa7627172c11979ec45c2db85f99182812ee59d Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 30 Jun 2015 13:59:27 +0300 Subject: Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). --- main/php_ini.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'main/php_ini.c') diff --git a/main/php_ini.c b/main/php_ini.c index 99919ca56e..ac79e60879 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -80,9 +80,9 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) int esc_html=0; if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) { - if (ini_entry->orig_value && ini_entry->orig_value->val[0]) { - display_string = ini_entry->orig_value->val; - display_string_length = ini_entry->orig_value->len; + if (ini_entry->orig_value && ZSTR_VAL(ini_entry->orig_value)[0]) { + display_string = ZSTR_VAL(ini_entry->orig_value); + display_string_length = ZSTR_LEN(ini_entry->orig_value); esc_html = !sapi_module.phpinfo_as_text; } else { if (!sapi_module.phpinfo_as_text) { @@ -93,9 +93,9 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) display_string_length = sizeof("no value") - 1; } } - } else if (ini_entry->value && ini_entry->value->val[0]) { - display_string = ini_entry->value->val; - display_string_length = ini_entry->value->len; + } else if (ini_entry->value && ZSTR_VAL(ini_entry->value)[0]) { + display_string = ZSTR_VAL(ini_entry->value); + display_string_length = ZSTR_LEN(ini_entry->value); esc_html = !sapi_module.phpinfo_as_text; } else { if (!sapi_module.phpinfo_as_text) { @@ -129,14 +129,14 @@ static int php_ini_displayer(zval *el, void *arg) if (!sapi_module.phpinfo_as_text) { PUTS(""); PUTS(""); - PHPWRITE(ini_entry->name->val, ini_entry->name->len); + PHPWRITE(ZSTR_VAL(ini_entry->name), ZSTR_LEN(ini_entry->name)); PUTS(""); php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE); PUTS(""); php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG); PUTS("\n"); } else { - PHPWRITE(ini_entry->name->val, ini_entry->name->len); + PHPWRITE(ZSTR_VAL(ini_entry->name), ZSTR_LEN(ini_entry->name)); PUTS(" => "); php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE); PUTS(" => "); @@ -567,7 +567,7 @@ int php_init_config(void) fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &opened_path); efree(ini_fname); if (fh.handle.fp) { - fh.filename = opened_path->val; + fh.filename = ZSTR_VAL(opened_path); } } @@ -575,7 +575,7 @@ int php_init_config(void) if (!fh.handle.fp) { fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &opened_path); if (fh.handle.fp) { - fh.filename = opened_path->val; + fh.filename = ZSTR_VAL(opened_path); } } } -- cgit v1.2.1