summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Beaver <cellog@php.net>2008-04-16 04:01:33 +0000
committerGreg Beaver <cellog@php.net>2008-04-16 04:01:33 +0000
commitdc837b5f53717393c625e5a96ba00a7c56bf5c04 (patch)
tree02d8951fc0577fc53f7b31e2f10daa98173cdbd3
parent6eabae560b56d04c870a9cc63281fd192c241195 (diff)
downloadphp-git-dc837b5f53717393c625e5a96ba00a7c56bf5c04.tar.gz
rename is_zip parameter of phar_parse_metadata to more accurately reflect what it is
-rw-r--r--ext/phar/phar.c6
-rwxr-xr-xext/phar/phar_internal.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 232ecca528..0c74bddb54 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -495,16 +495,16 @@ int phar_open_loaded(char *fname, int fname_len, char *alias, int alias_len, int
*
* data is the serialized zval
*/
-int phar_parse_metadata(char **buffer, zval **metadata, int is_zip TSRMLS_DC) /* {{{ */
+int phar_parse_metadata(char **buffer, zval **metadata, int zip_metadata_len TSRMLS_DC) /* {{{ */
{
const unsigned char *p;
php_uint32 buf_len;
php_unserialize_data_t var_hash;
- if (!is_zip) {
+ if (!zip_metadata_len) {
PHAR_GET_32(*buffer, buf_len);
} else {
- buf_len = is_zip;
+ buf_len = zip_metadata_len;
}
if (buf_len) {
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index f801b5de33..4e75bcdbe8 100755
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -402,7 +402,7 @@ char *phar_find_in_include_path(char *file, int file_len, phar_archive_data **pp
char *phar_fix_filepath(char *path, int *new_len, int use_cwd TSRMLS_DC);
phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, php_stream *fp,
char **error, int for_write TSRMLS_DC);
-int phar_parse_metadata(char **buffer, zval **metadata, int is_zip TSRMLS_DC);
+int phar_parse_metadata(char **buffer, zval **metadata, int zip_metadata_len TSRMLS_DC);
void destroy_phar_manifest_entry(void *pDest);
int phar_seek_efp(phar_entry_info *entry, off_t offset, int whence, off_t position TSRMLS_DC);
php_stream *phar_get_efp(phar_entry_info *entry TSRMLS_DC);