felipe Fri Jul 4 14:43:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zip php_zip.c
Log:
- Reverted previous commit
- Moved protos to .c (sync with HEAD)
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.11&r2=1.1.2.38.2.12&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.38.2.11
php-src/ext/zip/php_zip.c:1.1.2.38.2.12
--- php-src/ext/zip/php_zip.c:1.1.2.38.2.11 Thu Jul 3 12:53:12 2008
+++ php-src/ext/zip/php_zip.c Fri Jul 4 14:43:53 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.1.2.38.2.11 2008/07/03 12:53:12 felipe Exp $ */
+/* $Id: php_zip.c,v 1.1.2.38.2.12 2008/07/04 14:43:53 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -32,6 +32,18 @@
#include "lib/zip.h"
#include "lib/zipint.h"
+/* zip_open is a macro for renaming libzip zipopen, so we need to use
PHP_NAMED_FUNCTION */
+static PHP_NAMED_FUNCTION(zif_zip_open);
+static PHP_NAMED_FUNCTION(zif_zip_read);
+static PHP_NAMED_FUNCTION(zif_zip_close);
+static PHP_NAMED_FUNCTION(zif_zip_entry_read);
+static PHP_NAMED_FUNCTION(zif_zip_entry_filesize);
+static PHP_NAMED_FUNCTION(zif_zip_entry_name);
+static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize);
+static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod);
+static PHP_NAMED_FUNCTION(zif_zip_entry_open);
+static PHP_NAMED_FUNCTION(zif_zip_entry_close);
+
#ifdef HAVE_GLOB
#ifndef PHP_WIN32
#include <glob.h>
@@ -1080,7 +1092,7 @@
/* {{{ proto resource zip_open(string filename)
Create new zip using source uri for output */
-PHP_NAMED_FUNCTION(zif_zip_open)
+static PHP_NAMED_FUNCTION(zif_zip_open)
{
char *filename;
int filename_len;
@@ -1112,7 +1124,7 @@
/* {{{ proto void zip_close(resource zip)
Close a Zip archive */
-PHP_NAMED_FUNCTION(zif_zip_close)
+static PHP_NAMED_FUNCTION(zif_zip_close)
{
zval * zip;
zip_rsrc *z_rsrc = NULL;
@@ -1129,7 +1141,7 @@
/* {{{ proto resource zip_read(resource zip)
Returns the next file in the archive */
-PHP_NAMED_FUNCTION(zif_zip_read)
+static PHP_NAMED_FUNCTION(zif_zip_read)
{
zval *zip_dp;
zip_read_rsrc *zr_rsrc;
@@ -1172,7 +1184,7 @@
/* {{{ proto bool zip_entry_open(resource zip_dp, resource zip_entry [, string
mode])
Open a Zip File, pointed by the resource entry */
/* Dummy function to follow the old API */
-PHP_NAMED_FUNCTION(zif_zip_entry_open)
+static PHP_NAMED_FUNCTION(zif_zip_entry_open)
{
zval * zip;
zval * zip_entry;
@@ -1199,7 +1211,7 @@
/* {{{ proto void zip_entry_close(resource zip_ent)
Close a zip entry */
/* another dummy function to fit in the old api*/
-PHP_NAMED_FUNCTION(zif_zip_entry_close)
+static PHP_NAMED_FUNCTION(zif_zip_entry_close)
{
zval * zip_entry;
zip_read_rsrc * zr_rsrc;
@@ -1216,7 +1228,7 @@
/* {{{ proto mixed zip_entry_read(resource zip_entry [, int len])
Read from an open directory entry */
-PHP_NAMED_FUNCTION(zif_zip_entry_read)
+static PHP_NAMED_FUNCTION(zif_zip_entry_read)
{
zval * zip_entry;
long len = 0;
@@ -1315,7 +1327,7 @@
/* {{{ proto string zip_entry_name(resource zip_entry)
Return the name given a ZZip entry */
-PHP_NAMED_FUNCTION(zif_zip_entry_name)
+static PHP_NAMED_FUNCTION(zif_zip_entry_name)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -1323,7 +1335,7 @@
/* {{{ proto int zip_entry_compressedsize(resource zip_entry)
Return the compressed size of a ZZip entry */
-PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize)
+static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
@@ -1331,7 +1343,7 @@
/* {{{ proto int zip_entry_filesize(resource zip_entry)
Return the actual filesize of a ZZip entry */
-PHP_NAMED_FUNCTION(zif_zip_entry_filesize)
+static PHP_NAMED_FUNCTION(zif_zip_entry_filesize)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
}
@@ -1339,7 +1351,7 @@
/* {{{ proto string zip_entry_compressionmethod(resource zip_entry)
Return a string containing the compression method used on a particular
entry */
-PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod)
+static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3);
}
@@ -2606,7 +2618,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.38.2.11 2008/07/03 12:53:12 felipe Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.38.2.12 2008/07/04 14:43:53 felipe Exp $");
php_info_print_table_row(2, "Zip version", "@PACKAGE_VERSION@");
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
