[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip php_zip.c

[Pierre-Alain Joye]

pajoye          Sat May 19 22:25:11 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/zip    php_zip.c 
  Log:
  - use the same checks for zip_stat
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.32&r2=1.1.2.33&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.32 php-src/ext/zip/php_zip.c:1.1.2.33
--- php-src/ext/zip/php_zip.c:1.1.2.32  Sat May 19 19:29:37 2007
+++ php-src/ext/zip/php_zip.c   Sat May 19 22:25:11 2007
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_zip.c,v 1.1.2.32 2007/05/19 19:29:37 iliaa Exp $ */
+/* $Id: php_zip.c,v 1.1.2.33 2007/05/19 22:25:11 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -62,7 +62,7 @@
                php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Empty string as 
entry name"); \
                RETURN_FALSE; \
        } \
-       if (zip_stat(za, path, flags, &sb)) { \
+       if (zip_stat(za, path, flags, &sb) != 0) { \
                RETURN_FALSE; \
        }
 /* }}} */
@@ -103,7 +103,7 @@
        size_t file_basename_len;
        int is_dir_only = 0;
 
-       if (file_len >= MAXPATHLEN || zip_stat(za, file, 0, &sb)) {
+       if (file_len >= MAXPATHLEN || zip_stat(za, file, 0, &sb) != 0) {
                return 0;
        }
 
@@ -1879,7 +1879,7 @@
                return;
        }
 
-       if (zip_stat(intern, filename, 0, &sb)) {
+       if (zip_stat(intern, filename, 0, &sb) != 0) {
                RETURN_FALSE;
        }
 
@@ -2022,7 +2022,7 @@
        php_info_print_table_start();
 
        php_info_print_table_row(2, "Zip", "enabled");
-       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.32 2007/05/19 19:29:37 iliaa Exp $");
+       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.33 2007/05/19 22:25:11 pajoye Exp $");
        php_info_print_table_row(2, "Zip version", "2.0.0");
        php_info_print_table_row(2, "Libzip version", "0.7.1");
 


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