felipe                                   Wed, 25 May 2011 22:23:48 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311423

Log:
- Fixed ZTS build and removed unused vars

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/standard/filestat.c
    U   php/php-src/trunk/ext/standard/filestat.c

Modified: php/php-src/branches/PHP_5_4/ext/standard/filestat.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/filestat.c        2011-05-25 
21:03:55 UTC (rev 311422)
+++ php/php-src/branches/PHP_5_4/ext/standard/filestat.c        2011-05-25 
22:23:48 UTC (rev 311423)
@@ -526,7 +526,7 @@
                char *pwbuf;

                if (pwbuflen < 1) {
-                       RETURN_FALSE;
+                       return FAILURE;
                }

                pwbuf = emalloc(pwbuflen);
@@ -666,8 +666,6 @@
        wrapper = php_stream_locate_url_wrapper(filename, NULL, 0 TSRMLS_CC);
        if(wrapper != &php_plain_files_wrapper || strncasecmp("file://", 
filename, 7) == 0) {
                if(wrapper && wrapper->wops->stream_metadata) {
-                       int option;
-                       void *value;
                        if(wrapper->wops->stream_metadata(wrapper, filename, 
PHP_STREAM_META_ACCESS, &mode, NULL TSRMLS_CC)) {
                                RETURN_TRUE;
                        } else {

Modified: php/php-src/trunk/ext/standard/filestat.c
===================================================================
--- php/php-src/trunk/ext/standard/filestat.c   2011-05-25 21:03:55 UTC (rev 
311422)
+++ php/php-src/trunk/ext/standard/filestat.c   2011-05-25 22:23:48 UTC (rev 
311423)
@@ -526,7 +526,7 @@
                char *pwbuf;

                if (pwbuflen < 1) {
-                       RETURN_FALSE;
+                       return FAILURE;
                }

                pwbuf = emalloc(pwbuflen);
@@ -666,8 +666,6 @@
        wrapper = php_stream_locate_url_wrapper(filename, NULL, 0 TSRMLS_CC);
        if(wrapper != &php_plain_files_wrapper || strncasecmp("file://", 
filename, 7) == 0) {
                if(wrapper && wrapper->wops->stream_metadata) {
-                       int option;
-                       void *value;
                        if(wrapper->wops->stream_metadata(wrapper, filename, 
PHP_STREAM_META_ACCESS, &mode, NULL TSRMLS_CC)) {
                                RETURN_TRUE;
                        } else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to