- Whitespace

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 33aa326ca5edb4f48ca77db3281b14f7fc1e9a6c..e1084701092587b68ce22b03eca1e9b37474d944 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -402,9 +402,9 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
 
                php_info_print_table_row(2, "Configuration File (php.ini) Path", php_ini_opened_path?php_ini_opened_path:PHP_CONFIG_FILE_PATH);
 
-               if(strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+               if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
                        php_info_print_table_row(2, "Scan this dir for additional .ini files", PHP_CONFIG_FILE_SCAN_DIR);
-                       if(php_ini_scanned_files) {
+                       if (php_ini_scanned_files) {
                                php_info_print_table_row(2, "additional .ini files parsed", php_ini_scanned_files);
                        }
                }
@@ -945,10 +945,13 @@ PHP_FUNCTION(php_uname)
 
 /* {{{ proto string php_ini_scanned_files(void)
    Return comma-separated string of .ini files parsed from the additional ini dir */
-PHP_FUNCTION(php_ini_scanned_files) {
-       if(strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
-               RETURN_STRING(php_ini_scanned_files,1);
-       } else RETURN_FALSE;
+PHP_FUNCTION(php_ini_scanned_files)
+{
+       if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+               RETURN_STRING(php_ini_scanned_files, 1);
+       } else {
+               RETURN_FALSE;
+       }
 }
 /* }}} */
 

diff --git a/main/php_ini.c b/main/php_ini.c
index af41b6c97b194b08971a6615c040c1622cbe784a..b9f99c2cf31360118bcf9e919f0669dfaec5f6c3 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -396,13 +396,15 @@ int php_init_config()
 
        /* If the config_file_scan_dir is set at compile-time, go and scan this directory and
         * parse any .ini files found in this directory. */
-       if(strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+       if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
                dirp = VCWD_OPENDIR(PHP_CONFIG_FILE_SCAN_DIR);
                if (dirp) {
                        fh.type = ZEND_HANDLE_FP;
                        while ((dir_entry = readdir(dirp)) != NULL) {
                                /* check for a .ini extension */
-                               if ((p = strrchr(dir_entry->d_name,'.')) && strcmp(p,".ini")) continue;
+                               if ((p = strrchr(dir_entry->d_name,'.')) && strcmp(p,".ini")) {
+                                       continue;
+                               }
                                snprintf(ini_file, MAXPATHLEN, "%s%c%s", PHP_CONFIG_FILE_SCAN_DIR, DEFAULT_SLASH, dir_entry->d_name);
                                if (VCWD_STAT(ini_file, &sb) == 0) {
                                        if (S_ISREG(sb.st_mode)) {