pajoye Wed Sep 6 13:03:55 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zip php_zip.c
Log:
- MFH: zip_open takes only one parameter (Thx Nuno L.)
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.8&r2=1.1.2.9&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.8 php-src/ext/zip/php_zip.c:1.1.2.9
--- php-src/ext/zip/php_zip.c:1.1.2.8 Sat Aug 26 12:23:43 2006
+++ php-src/ext/zip/php_zip.c Wed Sep 6 13:03:55 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.1.2.8 2006/08/26 12:23:43 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.9 2006/09/06 13:03:55 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -608,17 +608,16 @@
ZEND_GET_MODULE(zip)
#endif
-/* {{{ proto resource zip_open(string filename [,flags])
+/* {{{ proto resource zip_open(string filename)
Create new zip using source uri for output */
PHP_FUNCTION(zip_open)
{
char *filename;
int filename_len;
zip_rsrc *rsrc_int;
- long mode = 0;
int err = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename,
&filename_len, &mode) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &filename,
&filename_len) == FAILURE) {
return;
}
if (SAFEMODE_CHECKFILE(filename)) {
@@ -627,7 +626,7 @@
rsrc_int = (zip_rsrc *)emalloc(sizeof(zip_rsrc));
- rsrc_int->za = zip_open(filename, mode, &err);
+ rsrc_int->za = zip_open(filename, 0, &err);
if (rsrc_int->za == NULL) {
efree(rsrc_int);
RETURN_LONG((long)err);
@@ -1982,7 +1981,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.8 2006/08/26 12:23:43 pajoye Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.9 2006/09/06 13:03:55 pajoye Exp $");
php_info_print_table_row(2, "Zip version", "1.7.1");
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
