clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: use PHP_ZIP_VERSION_STRING and add add_ascii_assoc_string macro (easy sync)

Browse Source
This commit is contained in:
Pierre Joye 2008-08-08 15:52:53 +00:00
parent b9d7e8b048
commit f4087a70aa
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ext/zip/php_zip.c
View File

@ -88,9 +88,13 @@ static int le_zip_entry;
RETURN_FALSE; \
} \
RETURN_TRUE;
/* }}} */
#if (PHP_MAJOR_VERSION < 6)
# define add_ascii_assoc_string add_assoc_string
# define add_ascii_assoc_long add_assoc_long
#endif
#ifdef ZEND_ENGINE_2_1
/* {{{ php_zip_extract_file */
/* TODO: Simplify it */
@ -345,13 +349,13 @@ static int php_zip_parse_options(zval *options, long *remove_all_path,
#define RETURN_SB(sb) \
{ \
array_init(return_value); \
add_assoc_string(return_value, "name", (char *)(sb)->name, 1); \
add_assoc_long(return_value, "index", (long) (sb)->index); \
add_assoc_long(return_value, "crc", (long) (sb)->crc); \
add_assoc_long(return_value, "size", (long) (sb)->size); \
add_assoc_long(return_value, "mtime", (long) (sb)->mtime); \
add_assoc_long(return_value, "comp_size", (long) (sb)->comp_size); \
add_assoc_long(return_value, "comp_method", (long) (sb)->comp_method); \
add_ascii_assoc_string(return_value, "name", (char *)(sb)->name, 1); \
add_ascii_assoc_long(return_value, "index", (long) (sb)->index); \
add_ascii_assoc_long(return_value, "crc", (long) (sb)->crc); \
add_ascii_assoc_long(return_value, "size", (long) (sb)->size); \
add_ascii_assoc_long(return_value, "mtime", (long) (sb)->mtime); \
add_ascii_assoc_long(return_value, "comp_size", (long) (sb)->comp_size); \
add_ascii_assoc_long(return_value, "comp_method", (long) (sb)->comp_method); \
}
/* }}} */
@ -1071,7 +1075,7 @@ zend_module_entry zip_module_entry = {
NULL,
NULL,
PHP_MINFO(zip),
"@PACKAGE_VERSION@",
PHP_ZIP_VERSION_STRING,
STANDARD_MODULE_PROPERTIES
};
/* }}} */
@ -2612,7 +2616,7 @@ static PHP_MINFO_FUNCTION(zip)
php_info_print_table_row(2, "Zip", "enabled");
php_info_print_table_row(2, "Extension Version","$Id$");
php_info_print_table_row(2, "Zip version", "@PACKAGE_VERSION@");
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING);
php_info_print_table_row(2, "Libzip version", "0.7.1");
php_info_print_table_end();

4
ext/zip/php_zip.h
View File

@ -36,6 +36,8 @@ extern zend_module_entry zip_module_entry;
#include "lib/zip.h"
#define PHP_ZIP_VERSION_STRING "1.8.11"
#ifndef ZEND_ENGINE_2_1
# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0) || PHP_MAJOR_VERSION == 6
# define ZEND_ENGINE_2_1
@ -53,7 +55,7 @@ extern zend_module_entry zip_module_entry;
#if (PHP_MAJOR_VERSION < 6)
#define OPENBASEDIR_CHECKPATH(filename) \
(PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)
#else
#else
#define OPENBASEDIR_CHECKPATH(filename) \
php_check_open_basedir(filename TSRMLS_CC)
#endif