derick Mon Dec 30 10:03:51 2002 EDT
Modified files:
/php4/ext/standard info.c
/php4/main php_ini.c
Log:
- Whitespace
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.219 php4/ext/standard/info.c:1.220
--- php4/ext/standard/info.c:1.219 Thu Nov 14 16:15:42 2002
+++ php4/ext/standard/info.c Mon Dec 30 10:03:50 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.219 2002/11/14 21:15:42 andrei Exp $ */
+/* $Id: info.c,v 1.220 2002/12/30 15:03:50 derick Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -402,9 +402,9 @@
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 @@
/* {{{ 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;
+ }
}
/* }}} */
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.106 php4/main/php_ini.c:1.107
--- php4/main/php_ini.c:1.106 Tue Nov 12 15:56:47 2002
+++ php4/main/php_ini.c Mon Dec 30 10:03:50 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.106 2002/11/12 20:56:47 helly Exp $ */
+/* $Id: php_ini.c,v 1.107 2002/12/30 15:03:50 derick Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -396,13 +396,15 @@
/* 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)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
