diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 11:26:35 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-05 11:26:35 +0400 |
| commit | dd7c7e6fb2f8a172fc7d1ee2a9e5fcbb71366603 (patch) | |
| tree | 7080c3a49621d9654fa9387e937c96a1a5c54cb7 /ext/standard/basic_functions.c | |
| parent | 040dea8b82a00083b3975351271f34f3775d9a60 (diff) | |
| parent | 8218ab7724c2dec5af9a1bd1124601823be5cdd8 (diff) | |
| download | php-git-dd7c7e6fb2f8a172fc7d1ee2a9e5fcbb71366603.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Conflicts:
ext/standard/formatted_print.c
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 48c1469701..078ea9098f 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5488,7 +5488,7 @@ PHP_FUNCTION(set_include_path) return; } - old_value = zend_ini_string("include_path", sizeof("include_path")-1, 0); + old_value = zend_ini_string("include_path", sizeof("include_path") - 1, 0); /* copy to return here, because alter might free it! */ if (old_value) { RETVAL_STRING(old_value); @@ -5496,7 +5496,7 @@ PHP_FUNCTION(set_include_path) RETVAL_FALSE; } - key = STR_INIT("include_path", sizeof("include_path")-1, 0); + key = STR_INIT("include_path", sizeof("include_path") - 1, 0); if (zend_alter_ini_entry_ex(key, new_value, new_value_len, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) == FAILURE) { STR_RELEASE(key); zval_dtor(return_value); @@ -5516,7 +5516,7 @@ PHP_FUNCTION(get_include_path) return; } - str = zend_ini_string("include_path", sizeof("include_path"), 0); + str = zend_ini_string("include_path", sizeof("include_path") - 1, 0); if (str == NULL) { RETURN_FALSE; |