From: Jani Taskinen <jani@php.net>
Date: Thu, 27 Sep 2007 16:44:27 +0000 (+0000)
Subject: MFH: missing folding tag + use Z_STR* macros
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND_IN_5_3~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72e77213938d25b16a6e6bd0192489a712b46eaa;p=php

MFH: missing folding tag + use Z_STR* macros
---

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index a7ce691f95..f40d51ff95 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -195,9 +195,9 @@ ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_num
 		}
 		if ((zend_get_configuration_directive(p->name, p->name_length, &default_value)) == SUCCESS) {
 			if (!hashed_ini_entry->on_modify
-				|| hashed_ini_entry->on_modify(hashed_ini_entry, default_value.value.str.val, default_value.value.str.len, hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP TSRMLS_CC) == SUCCESS) {
-				hashed_ini_entry->value = default_value.value.str.val;
-				hashed_ini_entry->value_length = default_value.value.str.len;
+				|| hashed_ini_entry->on_modify(hashed_ini_entry, Z_STRVAL(default_value), Z_STRLEN(default_value), hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP TSRMLS_CC) == SUCCESS) {
+				hashed_ini_entry->value = Z_STRVAL(default_value);
+				hashed_ini_entry->value_length = Z_STRLEN(default_value);
 				config_directive_success = 1;
 			}
 		}
@@ -549,8 +549,9 @@ ZEND_API ZEND_INI_MH(OnUpdateLong) /* {{{ */
 	*p = zend_atoi(new_value, new_value_length);
 	return SUCCESS;
 }
+/* }}} */
 
-ZEND_API ZEND_INI_MH(OnUpdateLongGEZero)
+ZEND_API ZEND_INI_MH(OnUpdateLongGEZero) /* {{{ */
 {
 	long *p, tmp;
 #ifndef ZTS