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

[Pierre-Alain Joye]

pajoye          Mon Aug 14 15:07:52 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/zip    php_zip.c 
  Log:
  - nuke unused parameter (not present in old versions)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.4 php-src/ext/zip/php_zip.c:1.1.2.5
--- php-src/ext/zip/php_zip.c:1.1.2.4   Sun Aug 13 23:43:11 2006
+++ php-src/ext/zip/php_zip.c   Mon Aug 14 15:07:52 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_zip.c,v 1.1.2.4 2006/08/13 23:43:11 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.5 2006/08/14 15:07:52 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -657,17 +657,16 @@
 }
 /* }}} */
 
-/* {{{ proto resource zip_read(resource zip [, int flags])
+/* {{{ proto resource zip_read(resource zip)
    Returns the next file in the archive */
 PHP_FUNCTION(zip_read)
 {
        zval *zip_dp;
        zip_read_rsrc *zr_rsrc;
        int ret;
-       long flags = 0;
        zip_rsrc *rsrc_int;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zip_dp, 
flags) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zip_dp) == 
FAILURE) {
                return;
        }
        ZEND_FETCH_RESOURCE(rsrc_int, zip_rsrc *, &zip_dp, -1, le_zip_dir_name, 
le_zip_dir);
@@ -679,7 +678,7 @@
 
                zr_rsrc = emalloc(sizeof(zip_read_rsrc));
 
-               ret = zip_stat_index(rsrc_int->za, rsrc_int->index_current, 
flags, &zr_rsrc->sb);
+               ret = zip_stat_index(rsrc_int->za, rsrc_int->index_current, 0, 
&zr_rsrc->sb);
 
                if (ret != 0) {
                        efree(zr_rsrc);
@@ -745,17 +744,17 @@
 }
 /* }}} */
 
-/* {{{ proto mixed zip_entry_read(resource zip_entry [, int len [, int mode]])
+/* {{{ proto mixed zip_entry_read(resource zip_entry [, int len])
    Read from an open directory entry */
 PHP_FUNCTION(zip_entry_read)
 {
        zval * zip_entry;
-       long len = 0, mode = 0;
+       long len = 0;
        zip_read_rsrc * zr_rsrc;
        char *buffer;
        int n = 0;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|ll", 
&zip_entry, &len, &mode) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zip_entry, 
&len) == FAILURE) {
                return;
        }
 
@@ -1973,7 +1972,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.4 2006/08/13 23:43:11 pajoye Exp $");
+       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.5 2006/08/14 15:07:52 pajoye Exp $");
        php_info_print_table_row(2, "Zip version", "1.4.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