cvs: php4 /main streams.c
| From: | Andi Gutmans | Date: | Sat, 16 Mar 2002 18:16:56 +0000 |
| Subject: | cvs: php4 /main streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10252@lists.php.net to get a copy of this message | ||
andi Sat Mar 16 13:16:56 2002 EDT
Modified files:
/php4/main streams.c
Log:
- Indentation fix.
Never do:
if (expr) {
}
else
It should be:
if (expr) {
} else {
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.21 php4/main/streams.c:1.22
--- php4/main/streams.c:1.21 Sat Mar 16 11:06:18 2002
+++ php4/main/streams.c Sat Mar 16 13:16:55 2002
@@ -512,9 +512,9 @@
} else {
ret = fclose(data->file);
}
- }
- else
+ } else {
ret = 0;
+ }
efree(data);
@@ -680,11 +680,12 @@
if (VCWD_STAT(trypath, &sb) == 0) {
/* file exists ... check permission */
if ((php_check_safe_mode_include_dir(trypath TSRMLS_CC) == 0) ||
- php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM))
+ php_checkuid(trypath, mode, CHECKUID_CHECK_MODE_PARAM)) {
/* UID ok, or trypath is in safe_mode_include_dir */
stream = php_stream_fopen(trypath, mode, opened_path TSRMLS_CC);
- else
+ } else {
stream = NULL;
+ }
efree(pathbuf);
return stream;