iliaa                                    Wed, 21 Sep 2011 19:08:30 +0000

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

Log:
Removed unreachable code (stream == NULL check is done already)

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/zip/php_zip.c
    U   php/php-src/trunk/ext/zip/php_zip.c

Modified: php/php-src/branches/PHP_5_4/ext/zip/php_zip.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/zip/php_zip.c      2011-09-21 19:05:21 UTC 
(rev 317118)
+++ php/php-src/branches/PHP_5_4/ext/zip/php_zip.c      2011-09-21 19:08:30 UTC 
(rev 317119)
@@ -272,14 +272,6 @@
        }

        n = 0;
-       if (stream == NULL) {
-               int ret = zip_fclose(zf);
-               efree(fullpath);
-               efree(file_basename);
-               efree(file_dirname_fullpath);
-               free(new_state.cwd);
-               return 0;
-       }

        while ((n=zip_fread(zf, b, sizeof(b))) > 0) {
                php_stream_write(stream, b, n);

Modified: php/php-src/trunk/ext/zip/php_zip.c
===================================================================
--- php/php-src/trunk/ext/zip/php_zip.c 2011-09-21 19:05:21 UTC (rev 317118)
+++ php/php-src/trunk/ext/zip/php_zip.c 2011-09-21 19:08:30 UTC (rev 317119)
@@ -272,14 +272,6 @@
        }

        n = 0;
-       if (stream == NULL) {
-               int ret = zip_fclose(zf);
-               efree(fullpath);
-               efree(file_basename);
-               efree(file_dirname_fullpath);
-               free(new_state.cwd);
-               return 0;
-       }

        while ((n=zip_fread(zf, b, sizeof(b))) > 0) {
                php_stream_write(stream, b, n);

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

Reply via email to