svn: /php/php-src/ branches/PHP_5_3/ext/phar/dirstream.c branches/PHP_5_4/ext/phar/dirstream.c trunk/ext/phar/dirstream.c

pierrick Sun, 07 Aug 2011 05:46:31 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=314402 Log: Pointer returned is never used Changed paths: U php/php-src/branches/PHP_5_3/ext/phar/dirstream.c U php/php-src/branches/PHP_5_4/ext/phar/dirstream.c U php/php-src/trunk/ext/phar/dirstream.c Modified: php/php-src/branches/PHP_5_3/ext/phar/dirstream.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/dirstream.c 2011-08-07 05:24:11 UTC (rev 314401) +++ php/php-src/branches/PHP_5_3/ext/phar/dirstream.c 2011-08-07 05:46:31 UTC (rev 314402) @@ -503,7 +503,7 @@ return 0; } - if ((e = phar_get_entry_info_dir(phar, resource->path + 1, strlen(resource->path + 1), 0, &error, 1 TSRMLS_CC))) { + if (phar_get_entry_info_dir(phar, resource->path + 1, strlen(resource->path + 1), 0, &error, 1 TSRMLS_CC)) { /* entry exists as a file */ php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot create directory \"%s\" in phar \"%s\", file already exists", resource->path+1, resource->host); php_url_free(resource); Modified: php/php-src/branches/PHP_5_4/ext/phar/dirstream.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/phar/dirstream.c 2011-08-07 05:24:11 UTC (rev 314401) +++ php/php-src/branches/PHP_5_4/ext/phar/dirstream.c 2011-08-07 05:46:31 UTC (rev 314402) @@ -503,7 +503,7 @@ return 0; } - if ((e = phar_get_entry_info_dir(phar, resource->path + 1, strlen(resource->path + 1), 0, &error, 1 TSRMLS_CC))) { + if (phar_get_entry_info_dir(phar, resource->path + 1, strlen(resource->path + 1), 0, &error, 1 TSRMLS_CC)) { /* entry exists as a file */ php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot create directory \"%s\" in phar \"%s\", file already exists", resource->path+1, resource->host); php_url_free(resource); Modified: php/php-src/trunk/ext/phar/dirstream.c =================================================================== --- php/php-src/trunk/ext/phar/dirstream.c 2011-08-07 05:24:11 UTC (rev 314401) +++ php/php-src/trunk/ext/phar/dirstream.c 2011-08-07 05:46:31 UTC (rev 314402) @@ -503,7 +503,7 @@ return 0; } - if ((e = phar_get_entry_info_dir(phar, resource->path + 1, strlen(resource->path + 1), 0, &error, 1 TSRMLS_CC))) { + if (phar_get_entry_info_dir(phar, resource->path + 1, strlen(resource->path + 1), 0, &error, 1 TSRMLS_CC)) { /* entry exists as a file */ php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot create directory \"%s\" in phar \"%s\", file already exists", resource->path+1, resource->host); php_url_free(resource);