cellog Sat Jan 12 03:42:42 2008 UTC Modified files: /php-src/ext/zip config.w32 /php-src/ext/zip/lib zip.h zip_add.c zip_add_dir.c zip_close.c zip_delete.c zip_dirent.c zip_entry_free.c zip_entry_new.c zip_error.c zip_error_clear.c zip_error_get.c zip_error_get_sys_type.c zip_error_strerror.c zip_error_to_str.c zip_fclose.c zip_file_error_clear.c zip_file_error_get.c zip_file_get_offset.c zip_file_strerror.c zip_fopen.c zip_fopen_index.c zip_fread.c zip_free.c zip_get_archive_comment.c zip_get_file_comment.c zip_get_name.c zip_get_num_files.c zip_memdup.c zip_name_locate.c zip_new.c zip_open.c zip_rename.c zip_replace.c zip_set_archive_comment.c zip_set_file_comment.c zip_set_name.c zip_source_buffer.c zip_source_file.c zip_source_filep.c zip_source_free.c zip_source_function.c zip_source_zip.c zip_stat.c zip_stat_index.c zip_stat_init.c zip_strerror.c zip_unchange.c zip_unchange_all.c zip_unchange_archive.c zip_unchange_data.c zip_win32.h zipint.h Log: export symbols for use by other extensions like phar
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.w32?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/config.w32 diff -u php-src/ext/zip/config.w32:1.2 php-src/ext/zip/config.w32:1.3 --- php-src/ext/zip/config.w32:1.2 Wed Nov 1 00:53:32 2006 +++ php-src/ext/zip/config.w32 Sat Jan 12 03:42:41 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.2 2006/11/01 00:53:32 pajoye Exp $ +// $Id: config.w32,v 1.3 2008/01/12 03:42:41 cellog Exp $ // vim:ft=javascript ARG_ENABLE("zip", "ZIP support", "no"); @@ -31,6 +31,9 @@ AC_DEFINE('HAVE_ZLIB', 1); AC_DEFINE('HAVE_ZIP', 1); + if (PHP_ZIP_SHARED) { + ADD_FLAG("CFLAGS_ZIP", "/D PHP_ZIP_EXPORTS "); + } } else { WARNING("zip not enabled; libraries and headers not found"); } http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip.h?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/zip/lib/zip.h diff -u php-src/ext/zip/lib/zip.h:1.5 php-src/ext/zip/lib/zip.h:1.6 --- php-src/ext/zip/lib/zip.h:1.5 Mon Dec 31 07:12:17 2007 +++ php-src/ext/zip/lib/zip.h Sat Jan 12 03:42:41 2008 @@ -37,16 +37,22 @@ */ - -#ifdef __cplusplus -extern "C" { +#include "main/php.h" +#ifdef PHP_WIN32 +#include "zip_win32.h" +# ifdef PHP_ZIP_EXPORTS +# define PHPZIPAPI __declspec(dllexport) +# elif defined(COMPILE_DL_ZIP) +# define PHPZIPAPI __declspec(dllimport) +# endif +#else +#define PHPZIPAPI #endif - +BEGIN_EXTERN_C() #include <sys/types.h> #include <stdio.h> #include <time.h> -#include "zip_win32.h" /* flags for zip_open */ @@ -162,49 +168,46 @@ -int zip_add(struct zip *, const char *, struct zip_source *); -int zip_add_dir(struct zip *, const char *); -int zip_close(struct zip *); -int zip_delete(struct zip *, int); -void zip_error_clear(struct zip *); -void zip_error_get(struct zip *, int *, int *); -int zip_error_get_sys_type(int); -int zip_error_to_str(char *, size_t, int, int); -int zip_fclose(struct zip_file *); -void zip_file_error_clear(struct zip_file *); -void zip_file_error_get(struct zip_file *, int *, int *); -const char *zip_file_strerror(struct zip_file *); -struct zip_file *zip_fopen(struct zip *, const char *, int); -struct zip_file *zip_fopen_index(struct zip *, int, int); -ssize_t zip_fread(struct zip_file *, void *, size_t); -const char *zip_get_archive_comment(struct zip *, int *, int); -const char *zip_get_file_comment(struct zip *, int, int *, int); -const char *zip_get_name(struct zip *, int, int); -int zip_get_num_files(struct zip *); -int zip_name_locate(struct zip *, const char *, int); -struct zip *zip_open(const char *, int, int *); -int zip_rename(struct zip *, int, const char *); -int zip_replace(struct zip *, int, struct zip_source *); -int zip_set_archive_comment(struct zip *, const char *, int); -int zip_set_file_comment(struct zip *, int, const char *, int); -struct zip_source *zip_source_buffer(struct zip *, const void *, off_t, int); -struct zip_source *zip_source_file(struct zip *, const char *, off_t, off_t); -struct zip_source *zip_source_filep(struct zip *, FILE *, off_t, off_t); -void zip_source_free(struct zip_source *); -struct zip_source *zip_source_function(struct zip *, +PHPZIPAPI int zip_add(struct zip *, const char *, struct zip_source *); +PHPZIPAPI int zip_add_dir(struct zip *, const char *); +PHPZIPAPI int zip_close(struct zip *); +PHPZIPAPI int zip_delete(struct zip *, int); +PHPZIPAPI void zip_error_clear(struct zip *); +PHPZIPAPI void zip_error_get(struct zip *, int *, int *); +PHPZIPAPI int zip_error_get_sys_type(int); +PHPZIPAPI int zip_error_to_str(char *, size_t, int, int); +PHPZIPAPI int zip_fclose(struct zip_file *); +PHPZIPAPI void zip_file_error_clear(struct zip_file *); +PHPZIPAPI void zip_file_error_get(struct zip_file *, int *, int *); +PHPZIPAPI const char *zip_file_strerror(struct zip_file *); +PHPZIPAPI struct zip_file *zip_fopen(struct zip *, const char *, int); +PHPZIPAPI struct zip_file *zip_fopen_index(struct zip *, int, int); +PHPZIPAPI ssize_t zip_fread(struct zip_file *, void *, size_t); +PHPZIPAPI const char *zip_get_archive_comment(struct zip *, int *, int); +PHPZIPAPI const char *zip_get_file_comment(struct zip *, int, int *, int); +PHPZIPAPI const char *zip_get_name(struct zip *, int, int); +PHPZIPAPI int zip_get_num_files(struct zip *); +PHPZIPAPI int zip_name_locate(struct zip *, const char *, int); +PHPZIPAPI struct zip *zip_open(const char *, int, int *); +PHPZIPAPI int zip_rename(struct zip *, int, const char *); +PHPZIPAPI int zip_replace(struct zip *, int, struct zip_source *); +PHPZIPAPI int zip_set_archive_comment(struct zip *, const char *, int); +PHPZIPAPI int zip_set_file_comment(struct zip *, int, const char *, int); +PHPZIPAPI struct zip_source *zip_source_buffer(struct zip *, const void *, off_t, int); +PHPZIPAPI struct zip_source *zip_source_file(struct zip *, const char *, off_t, off_t); +PHPZIPAPI struct zip_source *zip_source_filep(struct zip *, FILE *, off_t, off_t); +PHPZIPAPI void zip_source_free(struct zip_source *); +PHPZIPAPI struct zip_source *zip_source_function(struct zip *, zip_source_callback, void *); -struct zip_source *zip_source_zip(struct zip *, struct zip *, int, int, +PHPZIPAPI struct zip_source *zip_source_zip(struct zip *, struct zip *, int, int, off_t, off_t); -int zip_stat(struct zip *, const char *, int, struct zip_stat *); -int zip_stat_index(struct zip *, int, int, struct zip_stat *); -void zip_stat_init(struct zip_stat *); -const char *zip_strerror(struct zip *); -int zip_unchange(struct zip *, int); -int zip_unchange_all(struct zip *); -int zip_unchange_archive(struct zip *); - -#ifdef __cplusplus -} -#endif +PHPZIPAPI int zip_stat(struct zip *, const char *, int, struct zip_stat *); +PHPZIPAPI int zip_stat_index(struct zip *, int, int, struct zip_stat *); +PHPZIPAPI void zip_stat_init(struct zip_stat *); +PHPZIPAPI const char *zip_strerror(struct zip *); +PHPZIPAPI int zip_unchange(struct zip *, int); +PHPZIPAPI int zip_unchange_all(struct zip *); +PHPZIPAPI int zip_unchange_archive(struct zip *); +END_EXTERN_C(); #endif /* _HAD_ZIP_H */ http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_add.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_add.c diff -u php-src/ext/zip/lib/zip_add.c:1.1 php-src/ext/zip/lib/zip_add.c:1.2 --- php-src/ext/zip/lib/zip_add.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_add.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_add(struct zip *za, const char *name, struct zip_source *source) { if (name == NULL || source == NULL) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_add_dir.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_add_dir.c diff -u php-src/ext/zip/lib/zip_add_dir.c:1.3 php-src/ext/zip/lib/zip_add_dir.c:1.4 --- php-src/ext/zip/lib/zip_add_dir.c:1.3 Mon Dec 31 07:12:18 2007 +++ php-src/ext/zip/lib/zip_add_dir.c Sat Jan 12 03:42:41 2008 @@ -43,7 +43,7 @@ -int +PHPZIPAPI int zip_add_dir(struct zip *za, const char *name) { int len, ret; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_close.c?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/zip/lib/zip_close.c diff -u php-src/ext/zip/lib/zip_close.c:1.7 php-src/ext/zip/lib/zip_close.c:1.8 --- php-src/ext/zip/lib/zip_close.c:1.7 Sat Feb 24 19:09:18 2007 +++ php-src/ext/zip/lib/zip_close.c Sat Jan 12 03:42:41 2008 @@ -56,7 +56,7 @@ static int _zip_changed(struct zip *, int *); static char *_zip_create_temp_output(struct zip *, FILE **); -int +PHPZIPAPI int zip_close(struct zip *za) { int survivors; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_delete.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_delete.c diff -u php-src/ext/zip/lib/zip_delete.c:1.1 php-src/ext/zip/lib/zip_delete.c:1.2 --- php-src/ext/zip/lib/zip_delete.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_delete.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_delete(struct zip *za, int idx) { if (idx < 0 || idx >= za->nentry) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_dirent.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_dirent.c diff -u php-src/ext/zip/lib/zip_dirent.c:1.3 php-src/ext/zip/lib/zip_dirent.c:1.4 --- php-src/ext/zip/lib/zip_dirent.c:1.3 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_dirent.c Sat Jan 12 03:42:41 2008 @@ -56,7 +56,7 @@ -void +PHPZIPAPI void _zip_cdir_free(struct zip_cdir *cd) { int i; @@ -73,7 +73,7 @@ -struct zip_cdir * +PHPZIPAPI struct zip_cdir * _zip_cdir_new(int nentry, struct zip_error *error) { struct zip_cdir *cd; @@ -102,7 +102,7 @@ -int +PHPZIPAPI int _zip_cdir_write(struct zip_cdir *cd, FILE *fp, struct zip_error *error) { int i; @@ -136,7 +136,7 @@ -void +PHPZIPAPI void _zip_dirent_finalize(struct zip_dirent *zde) { free(zde->filename); @@ -149,7 +149,7 @@ -void +PHPZIPAPI void _zip_dirent_init(struct zip_dirent *de) { de->version_madeby = 0; @@ -188,7 +188,7 @@ returned. */ -int +PHPZIPAPI int _zip_dirent_read(struct zip_dirent *zde, FILE *fp, unsigned char **bufp, unsigned int left, int localp, struct zip_error *error) @@ -333,7 +333,7 @@ returned. */ -int +PHPZIPAPI int _zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp, struct zip_error *error) { @@ -409,7 +409,7 @@ -unsigned short +PHPZIPAPI unsigned short _zip_read2(unsigned char **a) { unsigned short ret; @@ -422,7 +422,7 @@ -unsigned int +PHPZIPAPI unsigned int _zip_read4(unsigned char **a) { unsigned int ret; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_entry_free.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_entry_free.c diff -u php-src/ext/zip/lib/zip_entry_free.c:1.2 php-src/ext/zip/lib/zip_entry_free.c:1.3 --- php-src/ext/zip/lib/zip_entry_free.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_entry_free.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -void +PHPZIPAPI void _zip_entry_free(struct zip_entry *ze) { free(ze->ch_filename); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_entry_new.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_entry_new.c diff -u php-src/ext/zip/lib/zip_entry_new.c:1.2 php-src/ext/zip/lib/zip_entry_new.c:1.3 --- php-src/ext/zip/lib/zip_entry_new.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_entry_new.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -struct zip_entry * +PHPZIPAPI struct zip_entry * _zip_entry_new(struct zip *za) { struct zip_entry *ze; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_error.c?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/zip/lib/zip_error.c diff -u php-src/ext/zip/lib/zip_error.c:1.4 php-src/ext/zip/lib/zip_error.c:1.5 --- php-src/ext/zip/lib/zip_error.c:1.4 Mon Dec 31 07:12:18 2007 +++ php-src/ext/zip/lib/zip_error.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -void +PHPZIPAPI void _zip_error_clear(struct zip_error *err) { err->zip_err = ZIP_ER_OK; @@ -51,7 +51,7 @@ -void +PHPZIPAPI void _zip_error_copy(struct zip_error *dst, struct zip_error *src) { dst->zip_err = src->zip_err; @@ -60,7 +60,7 @@ -void +PHPZIPAPI void _zip_error_fini(struct zip_error *err) { free(err->str); @@ -69,7 +69,7 @@ -void +PHPZIPAPI void _zip_error_get(struct zip_error *err, int *zep, int *sep) { if (zep) @@ -84,7 +84,7 @@ -void +PHPZIPAPI void _zip_error_init(struct zip_error *err) { err->zip_err = ZIP_ER_OK; @@ -94,7 +94,7 @@ -void +PHPZIPAPI void _zip_error_set(struct zip_error *err, int ze, int se) { if (err) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_error_clear.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_error_clear.c diff -u php-src/ext/zip/lib/zip_error_clear.c:1.3 php-src/ext/zip/lib/zip_error_clear.c:1.4 --- php-src/ext/zip/lib/zip_error_clear.c:1.3 Mon Dec 31 07:12:18 2007 +++ php-src/ext/zip/lib/zip_error_clear.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -void +PHPZIPAPI void zip_error_clear(struct zip *za) { _zip_error_clear(&za->error); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_error_get.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_error_get.c diff -u php-src/ext/zip/lib/zip_error_get.c:1.1 php-src/ext/zip/lib/zip_error_get.c:1.2 --- php-src/ext/zip/lib/zip_error_get.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_error_get.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -void +PHPZIPAPI void zip_error_get(struct zip *za, int *zep, int *sep) { _zip_error_get(&za->error, zep, sep); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_error_get_sys_type.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_error_get_sys_type.c diff -u php-src/ext/zip/lib/zip_error_get_sys_type.c:1.1 php-src/ext/zip/lib/zip_error_get_sys_type.c:1.2 --- php-src/ext/zip/lib/zip_error_get_sys_type.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_error_get_sys_type.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_error_get_sys_type(int ze) { if (ze < 0 || ze >= _zip_nerr_str) http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_error_strerror.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_error_strerror.c diff -u php-src/ext/zip/lib/zip_error_strerror.c:1.3 php-src/ext/zip/lib/zip_error_strerror.c:1.4 --- php-src/ext/zip/lib/zip_error_strerror.c:1.3 Sat Feb 24 16:25:55 2007 +++ php-src/ext/zip/lib/zip_error_strerror.c Sat Jan 12 03:42:41 2008 @@ -45,7 +45,7 @@ -const char * +PHPZIPAPI const char * _zip_error_strerror(struct zip_error *err) { const char *zs, *ss; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_error_to_str.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_error_to_str.c diff -u php-src/ext/zip/lib/zip_error_to_str.c:1.1 php-src/ext/zip/lib/zip_error_to_str.c:1.2 --- php-src/ext/zip/lib/zip_error_to_str.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_error_to_str.c Sat Jan 12 03:42:41 2008 @@ -45,7 +45,7 @@ -int +PHPZIPAPI int zip_error_to_str(char *buf, size_t len, int ze, int se) { const char *zs, *ss; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_fclose.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_fclose.c diff -u php-src/ext/zip/lib/zip_fclose.c:1.2 php-src/ext/zip/lib/zip_fclose.c:1.3 --- php-src/ext/zip/lib/zip_fclose.c:1.2 Sat Nov 11 23:43:40 2006 +++ php-src/ext/zip/lib/zip_fclose.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -int +PHPZIPAPI int zip_fclose(struct zip_file *zf) { int i, ret; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_file_error_clear.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_file_error_clear.c diff -u php-src/ext/zip/lib/zip_file_error_clear.c:1.3 php-src/ext/zip/lib/zip_file_error_clear.c:1.4 --- php-src/ext/zip/lib/zip_file_error_clear.c:1.3 Mon Dec 31 07:12:18 2007 +++ php-src/ext/zip/lib/zip_file_error_clear.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -void +PHPZIPAPI void zip_file_error_clear(struct zip_file *zf) { _zip_error_clear(&zf->error); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_file_error_get.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_file_error_get.c diff -u php-src/ext/zip/lib/zip_file_error_get.c:1.1 php-src/ext/zip/lib/zip_file_error_get.c:1.2 --- php-src/ext/zip/lib/zip_file_error_get.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_file_error_get.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -void +PHPZIPAPI void zip_file_error_get(struct zip_file *zf, int *zep, int *sep) { _zip_error_get(&zf->error, zep, sep); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_file_get_offset.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_file_get_offset.c diff -u php-src/ext/zip/lib/zip_file_get_offset.c:1.2 php-src/ext/zip/lib/zip_file_get_offset.c:1.3 --- php-src/ext/zip/lib/zip_file_get_offset.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_file_get_offset.c Sat Jan 12 03:42:41 2008 @@ -56,7 +56,7 @@ On error, fills in za->error and returns 0. */ -unsigned int +PHPZIPAPI unsigned int _zip_file_get_offset(struct zip *za, int idx) { struct zip_dirent de; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_file_strerror.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_file_strerror.c diff -u php-src/ext/zip/lib/zip_file_strerror.c:1.1 php-src/ext/zip/lib/zip_file_strerror.c:1.2 --- php-src/ext/zip/lib/zip_file_strerror.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_file_strerror.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_file_strerror(struct zip_file *zf) { return _zip_error_strerror(&zf->error); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_fopen.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_fopen.c diff -u php-src/ext/zip/lib/zip_fopen.c:1.1 php-src/ext/zip/lib/zip_fopen.c:1.2 --- php-src/ext/zip/lib/zip_fopen.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_fopen.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -struct zip_file * +PHPZIPAPI struct zip_file * zip_fopen(struct zip *za, const char *fname, int flags) { int idx; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_fopen_index.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_fopen_index.c diff -u php-src/ext/zip/lib/zip_fopen_index.c:1.1 php-src/ext/zip/lib/zip_fopen_index.c:1.2 --- php-src/ext/zip/lib/zip_fopen_index.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_fopen_index.c Sat Jan 12 03:42:41 2008 @@ -46,7 +46,7 @@ -struct zip_file * +PHPZIPAPI struct zip_file * zip_fopen_index(struct zip *za, int fileno, int flags) { int len, ret; @@ -141,7 +141,7 @@ -int +PHPZIPAPI int _zip_file_fillbuf(void *buf, size_t buflen, struct zip_file *zf) { int i, j; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_fread.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_fread.c diff -u php-src/ext/zip/lib/zip_fread.c:1.2 php-src/ext/zip/lib/zip_fread.c:1.3 --- php-src/ext/zip/lib/zip_fread.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_fread.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -ssize_t +PHPZIPAPI ssize_t zip_fread(struct zip_file *zf, void *outbuf, size_t toread) { int ret; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_free.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_free.c diff -u php-src/ext/zip/lib/zip_free.c:1.2 php-src/ext/zip/lib/zip_free.c:1.3 --- php-src/ext/zip/lib/zip_free.c:1.2 Sat Nov 11 23:36:52 2006 +++ php-src/ext/zip/lib/zip_free.c Sat Jan 12 03:42:41 2008 @@ -45,7 +45,7 @@ frees the space allocated to a zipfile struct, and closes the corresponding file. */ -void +PHPZIPAPI void _zip_free(struct zip *za) { int i; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_get_archive_comment.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_get_archive_comment.c diff -u php-src/ext/zip/lib/zip_get_archive_comment.c:1.3 php-src/ext/zip/lib/zip_get_archive_comment.c:1.4 --- php-src/ext/zip/lib/zip_get_archive_comment.c:1.3 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_get_archive_comment.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_get_archive_comment(struct zip *za, int *lenp, int flags) { if ((flags & ZIP_FL_UNCHANGED) http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_get_file_comment.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_get_file_comment.c diff -u php-src/ext/zip/lib/zip_get_file_comment.c:1.2 php-src/ext/zip/lib/zip_get_file_comment.c:1.3 --- php-src/ext/zip/lib/zip_get_file_comment.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_get_file_comment.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_get_file_comment(struct zip *za, int idx, int *lenp, int flags) { if (idx < 0 || idx >= za->nentry) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_get_name.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_get_name.c diff -u php-src/ext/zip/lib/zip_get_name.c:1.1 php-src/ext/zip/lib/zip_get_name.c:1.2 --- php-src/ext/zip/lib/zip_get_name.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_get_name.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_get_name(struct zip *za, int idx, int flags) { return _zip_get_name(za, idx, flags, &za->error); @@ -48,7 +48,7 @@ -const char * +PHPZIPAPI const char * _zip_get_name(struct zip *za, int idx, int flags, struct zip_error *error) { if (idx < 0 || idx >= za->nentry) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_get_num_files.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_get_num_files.c diff -u php-src/ext/zip/lib/zip_get_num_files.c:1.1 php-src/ext/zip/lib/zip_get_num_files.c:1.2 --- php-src/ext/zip/lib/zip_get_num_files.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_get_num_files.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_get_num_files(struct zip *za) { if (za == NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_memdup.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_memdup.c diff -u php-src/ext/zip/lib/zip_memdup.c:1.2 php-src/ext/zip/lib/zip_memdup.c:1.3 --- php-src/ext/zip/lib/zip_memdup.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_memdup.c Sat Jan 12 03:42:41 2008 @@ -41,7 +41,7 @@ -void * +PHPZIPAPI void * _zip_memdup(const void *mem, size_t len, struct zip_error *error) { void *ret; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_name_locate.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_name_locate.c diff -u php-src/ext/zip/lib/zip_name_locate.c:1.1 php-src/ext/zip/lib/zip_name_locate.c:1.2 --- php-src/ext/zip/lib/zip_name_locate.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_name_locate.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -int +PHPZIPAPI int zip_name_locate(struct zip *za, const char *fname, int flags) { return _zip_name_locate(za, fname, flags, &za->error); @@ -50,7 +50,7 @@ -int +PHPZIPAPI int _zip_name_locate(struct zip *za, const char *fname, int flags, struct zip_error *error) { @@ -62,8 +62,11 @@ _zip_error_set(error, ZIP_ER_INVAL, 0); return -1; } - - cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp; +#ifdef PHP_WIN32 + cmp = (flags & ZIP_FL_NOCASE) ? stricmp : strcmp; +#else + cmp = (flags & ZIP_FL_NOCASE) ? strcasecmp : strcmp; +#endif n = (flags & ZIP_FL_UNCHANGED) ? za->cdir->nentry : za->nentry; for (i=0; i<n; i++) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_new.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_new.c diff -u php-src/ext/zip/lib/zip_new.c:1.2 php-src/ext/zip/lib/zip_new.c:1.3 --- php-src/ext/zip/lib/zip_new.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_new.c Sat Jan 12 03:42:41 2008 @@ -45,7 +45,7 @@ creates a new zipfile struct, and sets the contents to zero; returns the new struct. */ -struct zip * +PHPZIPAPI struct zip * _zip_new(struct zip_error *error) { struct zip *za; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_open.c?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/zip/lib/zip_open.c diff -u php-src/ext/zip/lib/zip_open.c:1.5 php-src/ext/zip/lib/zip_open.c:1.6 --- php-src/ext/zip/lib/zip_open.c:1.5 Mon Dec 31 07:12:18 2007 +++ php-src/ext/zip/lib/zip_open.c Sat Jan 12 03:42:41 2008 @@ -58,7 +58,7 @@ -struct zip * +PHPZIPAPI struct zip * zip_open(const char *fn, int flags, int *zep) { FILE *fp; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_rename.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_rename.c diff -u php-src/ext/zip/lib/zip_rename.c:1.1 php-src/ext/zip/lib/zip_rename.c:1.2 --- php-src/ext/zip/lib/zip_rename.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_rename.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_rename(struct zip *za, int idx, const char *name) { if (idx >= za->nentry || idx < 0) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_replace.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_replace.c diff -u php-src/ext/zip/lib/zip_replace.c:1.3 php-src/ext/zip/lib/zip_replace.c:1.4 --- php-src/ext/zip/lib/zip_replace.c:1.3 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_replace.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_replace(struct zip *za, int idx, struct zip_source *source) { if (idx < 0 || idx >= za->nentry || source == NULL) { @@ -57,7 +57,7 @@ -int +PHPZIPAPI int _zip_replace(struct zip *za, int idx, const char *name, struct zip_source *source) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_set_archive_comment.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_set_archive_comment.c diff -u php-src/ext/zip/lib/zip_set_archive_comment.c:1.3 php-src/ext/zip/lib/zip_set_archive_comment.c:1.4 --- php-src/ext/zip/lib/zip_set_archive_comment.c:1.3 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_set_archive_comment.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -int +PHPZIPAPI int zip_set_archive_comment(struct zip *za, const char *comment, int len) { char *tmpcom; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_set_file_comment.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_set_file_comment.c diff -u php-src/ext/zip/lib/zip_set_file_comment.c:1.2 php-src/ext/zip/lib/zip_set_file_comment.c:1.3 --- php-src/ext/zip/lib/zip_set_file_comment.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_set_file_comment.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -int +PHPZIPAPI int zip_set_file_comment(struct zip *za, int idx, const char *comment, int len) { char *tmpcom; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_set_name.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_set_name.c diff -u php-src/ext/zip/lib/zip_set_name.c:1.1 php-src/ext/zip/lib/zip_set_name.c:1.2 --- php-src/ext/zip/lib/zip_set_name.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_set_name.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -int +PHPZIPAPI int _zip_set_name(struct zip *za, int idx, const char *name) { char *s; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_source_buffer.c?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/zip/lib/zip_source_buffer.c diff -u php-src/ext/zip/lib/zip_source_buffer.c:1.4 php-src/ext/zip/lib/zip_source_buffer.c:1.5 --- php-src/ext/zip/lib/zip_source_buffer.c:1.4 Mon Dec 31 07:12:18 2007 +++ php-src/ext/zip/lib/zip_source_buffer.c Sat Jan 12 03:42:41 2008 @@ -52,7 +52,7 @@ -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_buffer(struct zip *za, const void *data, off_t len, int freep) { struct read_data *f; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_source_file.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_source_file.c diff -u php-src/ext/zip/lib/zip_source_file.c:1.2 php-src/ext/zip/lib/zip_source_file.c:1.3 --- php-src/ext/zip/lib/zip_source_file.c:1.2 Sat Feb 24 18:59:37 2007 +++ php-src/ext/zip/lib/zip_source_file.c Sat Jan 12 03:42:41 2008 @@ -43,7 +43,7 @@ -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_file(struct zip *za, const char *fname, off_t start, off_t len) { struct zip_source *zs; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_source_filep.c?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/zip/lib/zip_source_filep.c diff -u php-src/ext/zip/lib/zip_source_filep.c:1.4 php-src/ext/zip/lib/zip_source_filep.c:1.5 --- php-src/ext/zip/lib/zip_source_filep.c:1.4 Mon Dec 31 07:12:18 2007 +++ php-src/ext/zip/lib/zip_source_filep.c Sat Jan 12 03:42:41 2008 @@ -57,7 +57,7 @@ -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_filep(struct zip *za, FILE *file, off_t start, off_t len) { struct read_file *f; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_source_free.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_source_free.c diff -u php-src/ext/zip/lib/zip_source_free.c:1.1 php-src/ext/zip/lib/zip_source_free.c:1.2 --- php-src/ext/zip/lib/zip_source_free.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_source_free.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -void +PHPZIPAPI void zip_source_free(struct zip_source *source) { if (source == NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_source_function.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_source_function.c diff -u php-src/ext/zip/lib/zip_source_function.c:1.2 php-src/ext/zip/lib/zip_source_function.c:1.3 --- php-src/ext/zip/lib/zip_source_function.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_source_function.c Sat Jan 12 03:42:41 2008 @@ -42,7 +42,7 @@ -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_function(struct zip *za, zip_source_callback zcb, void *ud) { struct zip_source *zs; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_source_zip.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_source_zip.c diff -u php-src/ext/zip/lib/zip_source_zip.c:1.2 php-src/ext/zip/lib/zip_source_zip.c:1.3 --- php-src/ext/zip/lib/zip_source_zip.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_source_zip.c Sat Jan 12 03:42:41 2008 @@ -52,7 +52,7 @@ -struct zip_source * +PHPZIPAPI struct zip_source * zip_source_zip(struct zip *za, struct zip *srcza, int srcidx, int flags, off_t start, off_t len) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_stat.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_stat.c diff -u php-src/ext/zip/lib/zip_stat.c:1.1 php-src/ext/zip/lib/zip_stat.c:1.2 --- php-src/ext/zip/lib/zip_stat.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_stat.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_stat(struct zip *za, const char *fname, int flags, struct zip_stat *st) { int idx; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_stat_index.c?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/zip/lib/zip_stat_index.c diff -u php-src/ext/zip/lib/zip_stat_index.c:1.4 php-src/ext/zip/lib/zip_stat_index.c:1.5 --- php-src/ext/zip/lib/zip_stat_index.c:1.4 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_stat_index.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -int +PHPZIPAPI int zip_stat_index(struct zip *za, int index, int flags, struct zip_stat *st) { const char *name; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_stat_init.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_stat_init.c diff -u php-src/ext/zip/lib/zip_stat_init.c:1.2 php-src/ext/zip/lib/zip_stat_init.c:1.3 --- php-src/ext/zip/lib/zip_stat_init.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_stat_init.c Sat Jan 12 03:42:41 2008 @@ -39,7 +39,7 @@ -void +PHPZIPAPI void zip_stat_init(struct zip_stat *st) { st->name = NULL; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_strerror.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_strerror.c diff -u php-src/ext/zip/lib/zip_strerror.c:1.1 php-src/ext/zip/lib/zip_strerror.c:1.2 --- php-src/ext/zip/lib/zip_strerror.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_strerror.c Sat Jan 12 03:42:41 2008 @@ -40,7 +40,7 @@ -const char * +PHPZIPAPI const char * zip_strerror(struct zip *za) { return _zip_error_strerror(&za->error); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_unchange.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_unchange.c diff -u php-src/ext/zip/lib/zip_unchange.c:1.2 php-src/ext/zip/lib/zip_unchange.c:1.3 --- php-src/ext/zip/lib/zip_unchange.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_unchange.c Sat Jan 12 03:42:41 2008 @@ -41,7 +41,7 @@ -int +PHPZIPAPI int zip_unchange(struct zip *za, int idx) { return _zip_unchange(za, idx, 0); @@ -49,7 +49,7 @@ -int +PHPZIPAPI int _zip_unchange(struct zip *za, int idx, int allow_duplicates) { int i; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_unchange_all.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_unchange_all.c diff -u php-src/ext/zip/lib/zip_unchange_all.c:1.2 php-src/ext/zip/lib/zip_unchange_all.c:1.3 --- php-src/ext/zip/lib/zip_unchange_all.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_unchange_all.c Sat Jan 12 03:42:41 2008 @@ -41,7 +41,7 @@ -int +PHPZIPAPI int zip_unchange_all(struct zip *za) { int ret, i; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_unchange_archive.c?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/zip/lib/zip_unchange_archive.c diff -u php-src/ext/zip/lib/zip_unchange_archive.c:1.2 php-src/ext/zip/lib/zip_unchange_archive.c:1.3 --- php-src/ext/zip/lib/zip_unchange_archive.c:1.2 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_unchange_archive.c Sat Jan 12 03:42:41 2008 @@ -41,7 +41,7 @@ -int +PHPZIPAPI int zip_unchange_archive(struct zip *za) { free(za->ch_comment); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_unchange_data.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_unchange_data.c diff -u php-src/ext/zip/lib/zip_unchange_data.c:1.1 php-src/ext/zip/lib/zip_unchange_data.c:1.2 --- php-src/ext/zip/lib/zip_unchange_data.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_unchange_data.c Sat Jan 12 03:42:41 2008 @@ -39,7 +39,7 @@ #include "zipint.h" -void +PHPZIPAPI void _zip_unchange_data(struct zip_entry *ze) { if (ze->source) { http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_win32.h?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_win32.h diff -u php-src/ext/zip/lib/zip_win32.h:1.1 php-src/ext/zip/lib/zip_win32.h:1.2 --- php-src/ext/zip/lib/zip_win32.h:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_win32.h Sat Jan 12 03:42:41 2008 @@ -1,6 +1,3 @@ - -#ifdef _MSC_VER - #define _POSIX_ #include <windows.h> #include <io.h> @@ -12,9 +9,6 @@ #ifndef mode_t # define mode_t int #endif -#ifndef strcasecmp -# define strcasecmp stricmp -#endif #ifndef snprintf # define snprintf _snprintf #endif @@ -26,4 +20,3 @@ # define fseeko fseek #endif */ -#endif http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zipint.h?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zipint.h diff -u php-src/ext/zip/lib/zipint.h:1.3 php-src/ext/zip/lib/zipint.h:1.4 --- php-src/ext/zip/lib/zipint.h:1.3 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zipint.h Sat Jan 12 03:42:41 2008 @@ -39,6 +39,7 @@ #include <zlib.h> #include "zip.h" +BEGIN_EXTERN_C() #ifndef HAVE_FSEEKO #define fseeko(s, o, w) (fseek((s), (long int)(o), (w))) #endif @@ -185,42 +186,43 @@ -void _zip_cdir_free(struct zip_cdir *); -struct zip_cdir *_zip_cdir_new(int, struct zip_error *); -int _zip_cdir_write(struct zip_cdir *, FILE *, struct zip_error *); - -void _zip_dirent_finalize(struct zip_dirent *); -void _zip_dirent_init(struct zip_dirent *); -int _zip_dirent_read(struct zip_dirent *, FILE *, +PHPZIPAPI void _zip_cdir_free(struct zip_cdir *); +PHPZIPAPI struct zip_cdir *_zip_cdir_new(int, struct zip_error *); +PHPZIPAPI int _zip_cdir_write(struct zip_cdir *, FILE *, struct zip_error *); + +PHPZIPAPI void _zip_dirent_finalize(struct zip_dirent *); +PHPZIPAPI void _zip_dirent_init(struct zip_dirent *); +PHPZIPAPI int _zip_dirent_read(struct zip_dirent *, FILE *, unsigned char **, unsigned int, int, struct zip_error *); -int _zip_dirent_write(struct zip_dirent *, FILE *, int, struct zip_error *); +PHPZIPAPI int _zip_dirent_write(struct zip_dirent *, FILE *, int, struct zip_error *); -void _zip_entry_free(struct zip_entry *); -void _zip_entry_init(struct zip *, int); -struct zip_entry *_zip_entry_new(struct zip *); - -void _zip_error_clear(struct zip_error *); -void _zip_error_copy(struct zip_error *, struct zip_error *); -void _zip_error_fini(struct zip_error *); -void _zip_error_get(struct zip_error *, int *, int *); -void _zip_error_init(struct zip_error *); -void _zip_error_set(struct zip_error *, int, int); -const char *_zip_error_strerror(struct zip_error *); - -int _zip_file_fillbuf(void *, size_t, struct zip_file *); -unsigned int _zip_file_get_offset(struct zip *, int); - -void _zip_free(struct zip *); -const char *_zip_get_name(struct zip *, int, int, struct zip_error *); -int _zip_local_header_read(struct zip *, int); -void *_zip_memdup(const void *, size_t, struct zip_error *); -int _zip_name_locate(struct zip *, const char *, int, struct zip_error *); -struct zip *_zip_new(struct zip_error *); -unsigned short _zip_read2(unsigned char **); -unsigned int _zip_read4(unsigned char **); -int _zip_replace(struct zip *, int, const char *, struct zip_source *); -int _zip_set_name(struct zip *, int, const char *); -int _zip_unchange(struct zip *, int, int); -void _zip_unchange_data(struct zip_entry *); +PHPZIPAPI void _zip_entry_free(struct zip_entry *); +PHPZIPAPI void _zip_entry_init(struct zip *, int); +PHPZIPAPI struct zip_entry *_zip_entry_new(struct zip *); + +PHPZIPAPI void _zip_error_clear(struct zip_error *); +PHPZIPAPI void _zip_error_copy(struct zip_error *, struct zip_error *); +PHPZIPAPI void _zip_error_fini(struct zip_error *); +PHPZIPAPI void _zip_error_get(struct zip_error *, int *, int *); +PHPZIPAPI void _zip_error_init(struct zip_error *); +PHPZIPAPI void _zip_error_set(struct zip_error *, int, int); +PHPZIPAPI const char *_zip_error_strerror(struct zip_error *); + +PHPZIPAPI int _zip_file_fillbuf(void *, size_t, struct zip_file *); +PHPZIPAPI unsigned int _zip_file_get_offset(struct zip *, int); + +PHPZIPAPI void _zip_free(struct zip *); +PHPZIPAPI const char *_zip_get_name(struct zip *, int, int, struct zip_error *); +PHPZIPAPI int _zip_local_header_read(struct zip *, int); +PHPZIPAPI void *_zip_memdup(const void *, size_t, struct zip_error *); +PHPZIPAPI int _zip_name_locate(struct zip *, const char *, int, struct zip_error *); +PHPZIPAPI struct zip *_zip_new(struct zip_error *); +PHPZIPAPI unsigned short _zip_read2(unsigned char **); +PHPZIPAPI unsigned int _zip_read4(unsigned char **); +PHPZIPAPI int _zip_replace(struct zip *, int, const char *, struct zip_source *); +PHPZIPAPI int _zip_set_name(struct zip *, int, const char *); +PHPZIPAPI int _zip_unchange(struct zip *, int, int); +PHPZIPAPI void _zip_unchange_data(struct zip_entry *); +END_EXTERN_C(); #endif /* zipint.h */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php