cellog Sun Jan 13 06:02:30 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/zip/lib zip_alias.h zipint_alias.h
Modified files:
/php-src/ext/zip php_zip.c
/php-src/ext/zip/lib zip.h zipint.h
Log:
MFH: alias all zip identifiers to avoid potential name conflicts with other
apache libs that may export zip symbols
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.4&r2=1.1.2.38.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.38.2.4
php-src/ext/zip/php_zip.c:1.1.2.38.2.5
--- php-src/ext/zip/php_zip.c:1.1.2.38.2.4 Mon Dec 31 07:17:16 2007
+++ php-src/ext/zip/php_zip.c Sun Jan 13 06:02:30 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.1.2.38.2.4 2007/12/31 07:17:16 sebastian Exp $ */
+/* $Id: php_zip.c,v 1.1.2.38.2.5 2008/01/13 06:02:30 cellog Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -31,16 +31,17 @@
#include "lib/zip.h"
#include "lib/zipint.h"
-static PHP_FUNCTION(zip_open);
-static PHP_FUNCTION(zip_read);
-static PHP_FUNCTION(zip_close);
-static PHP_FUNCTION(zip_entry_read);
-static PHP_FUNCTION(zip_entry_filesize);
-static PHP_FUNCTION(zip_entry_name);
-static PHP_FUNCTION(zip_entry_compressedsize);
-static PHP_FUNCTION(zip_entry_compressionmethod);
-static PHP_FUNCTION(zip_entry_open);
-static PHP_FUNCTION(zip_entry_close);
+/* 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);
/* {{{ Resource le */
static int le_zip_dir;
@@ -273,9 +274,9 @@
/* {{{ zend_function_entry */
static const zend_function_entry zip_functions[] = {
- PHP_FE(zip_open, NULL)
- PHP_FE(zip_close, NULL)
- PHP_FE(zip_read, NULL)
+ PHP_RAW_NAMED_FE("zip_open", zif_zip_open, NULL)
+ PHP_RAW_NAMED_FE("zip_close", zif_zip_close, NULL)
+ PHP_RAW_NAMED_FE("zip_read", zif_zip_read, NULL)
PHP_FE(zip_entry_open, NULL)
PHP_FE(zip_entry_close, NULL)
PHP_FE(zip_entry_read, NULL)
@@ -634,6 +635,8 @@
/* }}}*/
+/* reset macro */
+#undef zip
/* {{{ function prototypes */
static PHP_MINIT_FUNCTION(zip);
static PHP_MSHUTDOWN_FUNCTION(zip);
@@ -659,10 +662,12 @@
#ifdef COMPILE_DL_ZIP
ZEND_GET_MODULE(zip)
#endif
+/* set macro */
+#define zip php_ziplib__zip
/* {{{ proto resource zip_open(string filename)
Create new zip using source uri for output */
-static PHP_FUNCTION(zip_open)
+static PHP_NAMED_FUNCTION(zif_zip_open)
{
char *filename;
int filename_len;
@@ -704,7 +709,7 @@
/* {{{ proto void zip_close(resource zip)
Close a Zip archive */
-static PHP_FUNCTION(zip_close)
+static PHP_NAMED_FUNCTION(zif_zip_close)
{
zval * zip;
zip_rsrc *z_rsrc = NULL;
@@ -721,7 +726,7 @@
/* {{{ proto resource zip_read(resource zip)
Returns the next file in the archive */
-static PHP_FUNCTION(zip_read)
+static PHP_NAMED_FUNCTION(zif_zip_read)
{
zval *zip_dp;
zip_read_rsrc *zr_rsrc;
@@ -765,7 +770,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 */
-static PHP_FUNCTION(zip_entry_open)
+static PHP_NAMED_FUNCTION(zif_zip_entry_open)
{
zval * zip;
zval * zip_entry;
@@ -792,7 +797,7 @@
/* {{{ proto void zip_entry_close(resource zip_ent)
Close a zip entry */
/* another dummy function to fit in the old api*/
-static PHP_FUNCTION(zip_entry_close)
+static PHP_NAMED_FUNCTION(zif_zip_entry_close)
{
zval * zip_entry;
zip_read_rsrc * zr_rsrc;
@@ -809,7 +814,7 @@
/* {{{ proto mixed zip_entry_read(resource zip_entry [, int len])
Read from an open directory entry */
-static PHP_FUNCTION(zip_entry_read)
+static PHP_NAMED_FUNCTION(zif_zip_entry_read)
{
zval * zip_entry;
long len = 0;
@@ -909,7 +914,7 @@
/* {{{ proto string zip_entry_name(resource zip_entry)
Return the name given a ZZip entry */
-static PHP_FUNCTION(zip_entry_name)
+static PHP_NAMED_FUNCTION(zif_zip_entry_name)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
}
@@ -917,7 +922,7 @@
/* {{{ proto int zip_entry_compressedsize(resource zip_entry)
Return the compressed size of a ZZip entry */
-static PHP_FUNCTION(zip_entry_compressedsize)
+static PHP_NAMED_FUNCTION(zif_zip_entry_compressedsize)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
@@ -925,7 +930,7 @@
/* {{{ proto int zip_entry_filesize(resource zip_entry)
Return the actual filesize of a ZZip entry */
-static PHP_FUNCTION(zip_entry_filesize)
+static PHP_NAMED_FUNCTION(zif_zip_entry_filesize)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
}
@@ -933,7 +938,7 @@
/* {{{ proto string zip_entry_compressionmethod(resource zip_entry)
Return a string containing the compression method used on a particular
entry */
-static PHP_FUNCTION(zip_entry_compressionmethod)
+static PHP_NAMED_FUNCTION(zif_zip_entry_compressionmethod)
{
php_zip_entry_get_info(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3);
}
@@ -2004,7 +2009,9 @@
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
+#undef zip
static PHP_MINIT_FUNCTION(zip)
+#define zip php_ziplib__zip
{
zend_class_entry ce;
@@ -2085,7 +2092,9 @@
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
+#undef zip
static PHP_MSHUTDOWN_FUNCTION(zip)
+#define zip php_ziplib__zip
{
zend_hash_destroy(&zip_prop_handlers);
php_unregister_url_stream_wrapper("zip" TSRMLS_CC);
@@ -2096,12 +2105,13 @@
/* {{{ PHP_MINFO_FUNCTION
*/
+#undef zip
static PHP_MINFO_FUNCTION(zip)
{
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.4 2007/12/31 07:17:16 sebastian Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.38.2.5 2008/01/13 06:02:30 cellog Exp $");
php_info_print_table_row(2, "Zip version", "2.0.0");
php_info_print_table_row(2, "Libzip version", "0.7.1");
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip.h?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&diff_format=u
Index: php-src/ext/zip/lib/zip.h
diff -u php-src/ext/zip/lib/zip.h:1.1.2.3.2.2
php-src/ext/zip/lib/zip.h:1.1.2.3.2.3
--- php-src/ext/zip/lib/zip.h:1.1.2.3.2.2 Sat Jan 12 03:48:38 2008
+++ php-src/ext/zip/lib/zip.h Sun Jan 13 06:02:30 2008
@@ -38,6 +38,8 @@
#include "main/php.h"
+/* #defines that rename all zip_ functions and structs */
+#include "zip_alias.h"
#ifdef PHP_WIN32
#include "zip_win32.h"
# ifdef PHP_ZIP_EXPORTS
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zipint.h?r1=1.1.2.1.2.1&r2=1.1.2.1.2.2&diff_format=u
Index: php-src/ext/zip/lib/zipint.h
diff -u php-src/ext/zip/lib/zipint.h:1.1.2.1.2.1
php-src/ext/zip/lib/zipint.h:1.1.2.1.2.2
--- php-src/ext/zip/lib/zipint.h:1.1.2.1.2.1 Sat Jan 12 03:48:39 2008
+++ php-src/ext/zip/lib/zipint.h Sun Jan 13 06:02:30 2008
@@ -39,6 +39,9 @@
#include <zlib.h>
#include "zip.h"
+/* #defines that rename all zip_ functions and structs */
+#include "zipint_alias.h"
+
BEGIN_EXTERN_C()
#ifndef HAVE_FSEEKO
#define fseeko(s, o, w) (fseek((s), (long int)(o), (w)))
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_alias.h?view=markup&rev=1.1
Index: php-src/ext/zip/lib/zip_alias.h
+++ php-src/ext/zip/lib/zip_alias.h
#define zip_source_cmd php_ziplib__zip_source_cmd
#define zip_source_callback php_ziplib__zip_source_callback
#define zip_stat php_ziplib__zip_stat
#define zip php_ziplib__zip
#define zip_file php_ziplib__zip_file
#define zip_source php_ziplib__zip_source
#define zip_add php_ziplib__zip_add
#define zip_add_dir php_ziplib__zip_add_dir
#define zip_close php_ziplib__zip_close
#define zip_delete php_ziplib__zip_delete
#define zip_error_clear php_ziplib__zip_error_clear
#define zip_error_get php_ziplib__zip_error_get
#define zip_error_get_sys_type php_ziplib__zip_error_get_sys_type
#define zip_error_to_str php_ziplib__zip_error_to_str
#define zip_fclose php_ziplib__zip_fclose
#define zip_file_error_clear php_ziplib__zip_fille_error_clear
#define zip_file_error_get php_ziplib__zip_file_error_get
#define zip_file_strerror php_ziplib__zip_file_strerror
#define zip_fopen php_ziplib__zip_fopen
#define zip_fopen_index php_ziplib__zip_fopen_index
#define zip_fread php_ziplib__zip_fread
#define zip_get_archive_comment php_ziplib__zip_get_archive_comment
#define zip_get_file_comment php_ziplib__zip_get_file_comment
#define zip_get_name php_ziplib__zip_get_name
#define zip_get_num_files php_ziplib__zip_get_num_files
#define zip_name_locate php_ziplib__zip_name_locate
#define zip_open php_ziplib__zip_open
#define zip_rename php_ziplib__zip_rename
#define zip_replace php_ziplib__zip_replace
#define zip_set_archive_comment php_ziplib__zip_set_archive_comment
#define zip_set_file_comment php_ziplib__zip_set_file_comment
#define zip_source_buffer php_ziplib__zip_source_buffer
#define zip_source_file php_ziplib__zip_source_file
#define zip_source_filep php_ziplib__zip_source_filep
#define zip_source_free php_ziplib__zip_source_free
#define zip_source_function php_ziplib__zip_source_function
#define zip_source_zip php_ziplib__zip_source_zip
#define zip_stat php_ziplib__zip_stat
#define zip_stat_index php_ziplib__zip_stat_index
#define zip_stat_init php_ziplib__zip_stat_init
#define zip_strerror php_ziplib__zip_strerror
#define zip_unchange php_ziplib__zip_unchange
#define zip_unchange_all php_ziplib__zip_unchange_all
#define zip_unchange_archive php_ziplib__zip_unchange_archive
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zipint_alias.h?view=markup&rev=1.1
Index: php-src/ext/zip/lib/zipint_alias.h
+++ php-src/ext/zip/lib/zipint_alias.h
#define zip_source_cmd php_ziplib__zip_source_cmd
#define zip_source_callback php_ziplib__zip_source_callback
#define zip_stat php_ziplib__zip_stat
#define zip php_ziplib__zip
#define zip_file php_ziplib__zip_file
#define zip_source php_ziplib__zip_source
#define zip_add php_ziplib__zip_add
#define zip_add_dir php_ziplib__zip_add_dir
#define zip_close php_ziplib__zip_close
#define zip_delete php_ziplib__zip_delete
#define zip_error_clear php_ziplib__zip_error_clear
#define zip_error_get php_ziplib__zip_error_get
#define zip_error_get_sys_type php_ziplib__zip_error_get_sys_type
#define zip_error_to_str php_ziplib__zip_error_to_str
#define zip_fclose php_ziplib__zip_fclose
#define zip_file_error_clear php_ziplib__zip_fille_error_clear
#define zip_file_error_get php_ziplib__zip_file_error_get
#define zip_file_strerror php_ziplib__zip_file_strerror
#define zip_fopen php_ziplib__zip_fopen
#define zip_fopen_index php_ziplib__zip_fopen_index
#define zip_fread php_ziplib__zip_fread
#define zip_get_archive_comment php_ziplib__zip_get_archive_comment
#define zip_get_file_comment php_ziplib__zip_get_file_comment
#define zip_get_name php_ziplib__zip_get_name
#define zip_get_num_files php_ziplib__zip_get_num_files
#define zip_name_locate php_ziplib__zip_name_locate
#define zip_open php_ziplib__zip_open
#define zip_rename php_ziplib__zip_rename
#define zip_replace php_ziplib__zip_replace
#define zip_set_archive_comment php_ziplib__zip_set_archive_comment
#define zip_set_file_comment php_ziplib__zip_set_file_comment
#define zip_source_buffer php_ziplib__zip_source_buffer
#define zip_source_file php_ziplib__zip_source_file
#define zip_source_filep php_ziplib__zip_source_filep
#define zip_source_free php_ziplib__zip_source_free
#define zip_source_function php_ziplib__zip_source_function
#define zip_source_zip php_ziplib__zip_source_zip
#define zip_stat php_ziplib__zip_stat
#define zip_stat_index php_ziplib__zip_stat_index
#define zip_stat_init php_ziplib__zip_stat_init
#define zip_strerror php_ziplib__zip_strerror
#define zip_unchange php_ziplib__zip_unchange
#define zip_unchange_all php_ziplib__zip_unchange_all
#define zip_unchange_archive php_ziplib__zip_unchange_archive
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
