cellog Sun Jan 13 06:22:27 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/zip php_zip.c /php-src/ext/zip/lib zipint_alias.h Log: a few fixes: overwrite all my careful work in zipint_alias.h with zipint.h, so had to restore that. PHP_RAW_NAMED_FE() won't work, have to use ZEND_RAW_FENTRY http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.5&r2=1.1.2.38.2.6&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.5 php-src/ext/zip/php_zip.c:1.1.2.38.2.6 --- php-src/ext/zip/php_zip.c:1.1.2.38.2.5 Sun Jan 13 06:02:30 2008 +++ php-src/ext/zip/php_zip.c Sun Jan 13 06:22:27 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_zip.c,v 1.1.2.38.2.5 2008/01/13 06:02:30 cellog Exp $ */ +/* $Id: php_zip.c,v 1.1.2.38.2.6 2008/01/13 06:22:27 cellog Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -274,9 +274,9 @@ /* {{{ zend_function_entry */ static const zend_function_entry zip_functions[] = { - 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) + ZEND_RAW_FENTRY("zip_open", zif_zip_open, NULL, 0) + ZEND_RAW_FENTRY("zip_close", zif_zip_close, NULL, 0) + ZEND_RAW_FENTRY("zip_read", zif_zip_read, NULL, 0) PHP_FE(zip_entry_open, NULL) PHP_FE(zip_entry_close, NULL) PHP_FE(zip_entry_read, NULL) @@ -2111,7 +2111,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.5 2008/01/13 06:02:30 cellog Exp $"); + php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.1.2.38.2.6 2008/01/13 06:22:27 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/zipint_alias.h?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/zip/lib/zipint_alias.h diff -u php-src/ext/zip/lib/zipint_alias.h:1.1.2.2 php-src/ext/zip/lib/zipint_alias.h:1.1.2.3 --- php-src/ext/zip/lib/zipint_alias.h:1.1.2.2 Sun Jan 13 06:02:30 2008 +++ php-src/ext/zip/lib/zipint_alias.h Sun Jan 13 06:22:27 2008 @@ -1,45 +1,49 @@ -#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 +/* state of change of a file in zip archive */ +#define zip_state php_ziplib__zip_state +#define zip_error php_ziplib__zip_error +#define zip_dirent php_ziplib__zip_dirent +#define zip_cdir php_ziplib__zip_cdir #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 +#define zip_entry php_ziplib__zip_entry + +#define _zip_err_str php_ziplib___zip_err_str +#define _zip_nerr_str php_ziplib___zip_nerr_str +#define _zip_err_type php_ziplib___zip_err_type + +#define _zip_cdir_free php_ziplib___zip_cdir_free +#define _zip_cdir_new php_ziplib___zip_cdir_new +#define _zip_cdir_write php_ziplib___zip_cdir_write + +#define _zip_dirent_finalize php_ziplib___zip_dirent_finalize +#define _zip_dirent_init php_ziplib___zip_dirent_init +#define _zip_dirent_read php_ziplib___zip_dirent_read +#define _zip_dirent_write php_ziplib___zip_dirent_write + +#define _zip_entry_free php_ziplib___zip_entry_free +#define _zip_entry_init php_ziplib___zip_entry_init +#define _zip_entry_new php_ziplib___zip_entry_new + +#define _zip_error_clear php_ziplib___zip_error_clear +#define _zip_error_copy php_ziplib___zip_error_copy +#define _zip_error_fini php_ziplib___zip_error_fini +#define _zip_error_get php_ziplib___zip_error_get +#define _zip_error_init php_ziplib___zip_error_init +#define _zip_error_set php_ziplib___zip_error_set +#define _zip_error_strerror php_ziplib___zip_error_strerror + +#define _zip_file_fillbuf php_ziplib___zip_file_fillbuf +#define _zip_file_get_offset php_ziplib___zip_file_get_offset + +#define _zip_free php_ziplib___zip_free +#define _zip_get_name php_ziplib___zip_get_name +#define _zip_local_header_read php_ziplib___zip_local_header_read +#define _zip_memdup php_ziplib___zip_memdup +#define _zip_name_locate php_ziplib___zip_name_locate +#define _zip_new php_ziplib___zip_new +#define _zip_read2 php_ziplib___zip_read2 +#define _zip_read4 php_ziplib___zip_read4 +#define _zip_replace php_ziplib___zip_replace +#define _zip_set_name php_ziplib___zip_set_name +#define _zip_unchange php_ziplib___zip_unchange +#define _zip_unchange_data php_ziplib___zip_unchange_data
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php