pajoye                                   Tue, 01 Feb 2011 10:57:51 +0000

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

Log:
- WS

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

Modified: php/php-src/branches/PHP_5_3/ext/zip/php_zip.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/zip/php_zip.c      2011-02-01 10:52:23 UTC 
(rev 307904)
+++ php/php-src/branches/PHP_5_3/ext/zip/php_zip.c      2011-02-01 10:57:51 UTC 
(rev 307905)
@@ -2418,21 +2418,21 @@
                                break;
                }
        } else {
-        /* Extract all files */
-        int filecount = zip_get_num_files(intern);
+                               /* Extract all files */
+                               int filecount = zip_get_num_files(intern);

-        if (filecount == -1) {
-            php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal archive");
-            RETURN_FALSE;
-        }
+                               if (filecount == -1) {
+                                               php_error_docref(NULL 
TSRMLS_CC, E_WARNING, "Illegal archive");
+                                               RETURN_FALSE;
+                               }

-        for (i = 0; i < filecount; i++) {
-                       char *file = (char*)zip_get_name(intern, i, 
ZIP_FL_UNCHANGED);
-            if (!php_zip_extract_file(intern, pathto, file, strlen(file) 
TSRMLS_CC)) {
-                RETURN_FALSE;
-            }
-        }
-    }
+                               for (i = 0; i < filecount; i++) {
+                                               char *file = 
(char*)zip_get_name(intern, i, ZIP_FL_UNCHANGED);
+                                               if 
(!php_zip_extract_file(intern, pathto, file, strlen(file) TSRMLS_CC)) {
+                                                       RETURN_FALSE;
+                                               }
+                               }
+               }
        RETURN_TRUE;
 }
 /* }}} */

Modified: php/php-src/trunk/ext/zip/php_zip.c
===================================================================
--- php/php-src/trunk/ext/zip/php_zip.c 2011-02-01 10:52:23 UTC (rev 307904)
+++ php/php-src/trunk/ext/zip/php_zip.c 2011-02-01 10:57:51 UTC (rev 307905)
@@ -2379,12 +2379,12 @@
                RETURN_FALSE;
        }

-    if (php_stream_stat_path_ex(pathto, PHP_STREAM_URL_STAT_QUIET, &ssb, NULL) 
< 0) {
-        ret = php_stream_mkdir(pathto, 0777,  PHP_STREAM_MKDIR_RECURSIVE, 
NULL);
-        if (!ret) {
-            RETURN_FALSE;
-        }
-    }
+       if (php_stream_stat_path_ex(pathto, PHP_STREAM_URL_STAT_QUIET, &ssb, 
NULL) < 0) {
+                       ret = php_stream_mkdir(pathto, 0777,  
PHP_STREAM_MKDIR_RECURSIVE, NULL);
+                       if (!ret) {
+                                       RETURN_FALSE;
+                       }
+       }

        ZIP_FROM_OBJECT(intern, this);
        if (zval_files && (Z_TYPE_P(zval_files) != IS_NULL)) {
@@ -2419,21 +2419,21 @@
                                break;
                }
        } else {
-        /* Extract all files */
-        int filecount = zip_get_num_files(intern);
+               /* Extract all files */
+               int filecount = zip_get_num_files(intern);

-        if (filecount == -1) {
-            php_error_docref(NULL TSRMLS_CC, E_WARNING, "Illegal archive");
-            RETURN_FALSE;
-        }
+               if (filecount == -1) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, 
"Illegal archive");
+                               RETURN_FALSE;
+               }

-        for (i = 0; i < filecount; i++) {
+               for (i = 0; i < filecount; i++) {
                        char *file = (char*)zip_get_name(intern, i, 
ZIP_FL_UNCHANGED);
-            if (!php_zip_extract_file(intern, pathto, file, strlen(file) 
TSRMLS_CC)) {
-                RETURN_FALSE;
-            }
-        }
-    }
+                       if (!php_zip_extract_file(intern, pathto, file, 
strlen(file) TSRMLS_CC)) {
+                                       RETURN_FALSE;
+                       }
+               }
+       }
        RETURN_TRUE;
 }
 /* }}} */

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

Reply via email to