diff options
Diffstat (limited to 'ext/phar/phar_internal.h')
| -rw-r--r-- | ext/phar/phar_internal.h | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index 7fe647b97d..fed80029f6 100644 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -346,7 +346,7 @@ struct _phar_entry_fp { phar_entry_fp_info *manifest; }; -static inline php_stream *phar_get_entrypfp(phar_entry_info *entry TSRMLS_DC) +static inline php_stream *phar_get_entrypfp(phar_entry_info *entry) { if (!entry->is_persistent) { return entry->phar->fp; @@ -354,7 +354,7 @@ static inline php_stream *phar_get_entrypfp(phar_entry_info *entry TSRMLS_DC) return PHAR_GLOBALS->cached_fp[entry->phar->phar_pos].fp; } -static inline php_stream *phar_get_entrypufp(phar_entry_info *entry TSRMLS_DC) +static inline php_stream *phar_get_entrypufp(phar_entry_info *entry) { if (!entry->is_persistent) { return entry->phar->ufp; @@ -362,7 +362,7 @@ static inline php_stream *phar_get_entrypufp(phar_entry_info *entry TSRMLS_DC) return PHAR_GLOBALS->cached_fp[entry->phar->phar_pos].ufp; } -static inline void phar_set_entrypfp(phar_entry_info *entry, php_stream *fp TSRMLS_DC) +static inline void phar_set_entrypfp(phar_entry_info *entry, php_stream *fp) { if (!entry->phar->is_persistent) { entry->phar->fp = fp; @@ -372,7 +372,7 @@ static inline void phar_set_entrypfp(phar_entry_info *entry, php_stream *fp TSRM PHAR_GLOBALS->cached_fp[entry->phar->phar_pos].fp = fp; } -static inline void phar_set_entrypufp(phar_entry_info *entry, php_stream *fp TSRMLS_DC) +static inline void phar_set_entrypufp(phar_entry_info *entry, php_stream *fp) { if (!entry->phar->is_persistent) { entry->phar->ufp = fp; @@ -382,7 +382,7 @@ static inline void phar_set_entrypufp(phar_entry_info *entry, php_stream *fp TSR PHAR_GLOBALS->cached_fp[entry->phar->phar_pos].ufp = fp; } -static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_DC) +static inline php_stream *phar_get_pharfp(phar_archive_data *phar) { if (!phar->is_persistent) { return phar->fp; @@ -390,7 +390,7 @@ static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_DC) return PHAR_GLOBALS->cached_fp[phar->phar_pos].fp; } -static inline php_stream *phar_get_pharufp(phar_archive_data *phar TSRMLS_DC) +static inline php_stream *phar_get_pharufp(phar_archive_data *phar) { if (!phar->is_persistent) { return phar->ufp; @@ -398,7 +398,7 @@ static inline php_stream *phar_get_pharufp(phar_archive_data *phar TSRMLS_DC) return PHAR_GLOBALS->cached_fp[phar->phar_pos].ufp; } -static inline void phar_set_pharfp(phar_archive_data *phar, php_stream *fp TSRMLS_DC) +static inline void phar_set_pharfp(phar_archive_data *phar, php_stream *fp) { if (!phar->is_persistent) { phar->fp = fp; @@ -408,7 +408,7 @@ static inline void phar_set_pharfp(phar_archive_data *phar, php_stream *fp TSRML PHAR_GLOBALS->cached_fp[phar->phar_pos].fp = fp; } -static inline void phar_set_pharufp(phar_archive_data *phar, php_stream *fp TSRMLS_DC) +static inline void phar_set_pharufp(phar_archive_data *phar, php_stream *fp) { if (!phar->is_persistent) { phar->ufp = fp; @@ -418,7 +418,7 @@ static inline void phar_set_pharufp(phar_archive_data *phar, php_stream *fp TSRM PHAR_GLOBALS->cached_fp[phar->phar_pos].ufp = fp; } -static inline void phar_set_fp_type(phar_entry_info *entry, enum phar_fp_type type, zend_off_t offset TSRMLS_DC) +static inline void phar_set_fp_type(phar_entry_info *entry, enum phar_fp_type type, zend_off_t offset) { phar_entry_fp_info *data; @@ -432,7 +432,7 @@ static inline void phar_set_fp_type(phar_entry_info *entry, enum phar_fp_type ty data->offset = offset; } -static inline enum phar_fp_type phar_get_fp_type(phar_entry_info *entry TSRMLS_DC) +static inline enum phar_fp_type phar_get_fp_type(phar_entry_info *entry) { if (!entry->is_persistent) { return entry->fp_type; @@ -440,7 +440,7 @@ static inline enum phar_fp_type phar_get_fp_type(phar_entry_info *entry TSRMLS_D return PHAR_GLOBALS->cached_fp[entry->phar->phar_pos].manifest[entry->manifest_pos].fp_type; } -static inline zend_off_t phar_get_fp_offset(phar_entry_info *entry TSRMLS_DC) +static inline zend_off_t phar_get_fp_offset(phar_entry_info *entry) { if (!entry->is_persistent) { return entry->offset; @@ -495,7 +495,7 @@ union _phar_entry_object { #endif #ifndef PHAR_MAIN -extern char *(*phar_save_resolve_path)(const char *filename, int filename_len TSRMLS_DC); +extern char *(*phar_save_resolve_path)(const char *filename, int filename_len); #endif BEGIN_EXTERN_C() @@ -525,7 +525,7 @@ static inline int phar_validate_alias(const char *alias, int alias_len) /* {{{ * } /* }}} */ -static inline void phar_set_inode(phar_entry_info *entry TSRMLS_DC) /* {{{ */ +static inline void phar_set_inode(phar_entry_info *entry) /* {{{ */ { char tmp[MAXPATHLEN]; int tmp_len; @@ -537,75 +537,75 @@ static inline void phar_set_inode(phar_entry_info *entry TSRMLS_DC) /* {{{ */ } /* }}} */ -void phar_request_initialize(TSRMLS_D); +void phar_request_initialize(void); -void phar_object_init(TSRMLS_D); -void phar_destroy_phar_data(phar_archive_data *phar TSRMLS_DC); +void phar_object_init(void); +void phar_destroy_phar_data(phar_archive_data *phar); -int phar_open_entry_file(phar_archive_data *phar, phar_entry_info *entry, char **error TSRMLS_DC); -int phar_postprocess_file(phar_entry_data *idata, php_uint32 crc32, char **error, int process_zip TSRMLS_DC); -int phar_open_from_filename(char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, char **error TSRMLS_DC); -int phar_open_or_create_filename(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error TSRMLS_DC); -int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error TSRMLS_DC); -int phar_open_executed_filename(char *alias, int alias_len, char **error TSRMLS_DC); -int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len TSRMLS_DC); -int phar_get_archive(phar_archive_data **archive, char *fname, int fname_len, char *alias, int alias_len, char **error TSRMLS_DC); -int phar_open_parsed_phar(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error TSRMLS_DC); -int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error TSRMLS_DC); -int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, int *signature_length, char **error TSRMLS_DC); +int phar_open_entry_file(phar_archive_data *phar, phar_entry_info *entry, char **error); +int phar_postprocess_file(phar_entry_data *idata, php_uint32 crc32, char **error, int process_zip); +int phar_open_from_filename(char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, char **error); +int phar_open_or_create_filename(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error); +int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error); +int phar_open_executed_filename(char *alias, int alias_len, char **error); +int phar_free_alias(phar_archive_data *phar, char *alias, int alias_len); +int phar_get_archive(phar_archive_data **archive, char *fname, int fname_len, char *alias, int alias_len, char **error); +int phar_open_parsed_phar(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error); +int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_type, char *sig, int sig_len, char *fname, char **signature, int *signature_len, char **error); +int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, int *signature_length, char **error); /* utility functions */ -char *phar_create_default_stub(const char *index_php, const char *web_index, size_t *len, char **error TSRMLS_DC); +char *phar_create_default_stub(const char *index_php, const char *web_index, size_t *len, char **error); char *phar_decompress_filter(phar_entry_info * entry, int return_unknown); char *phar_compress_filter(phar_entry_info * entry, int return_unknown); -void phar_remove_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len TSRMLS_DC); -void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len TSRMLS_DC); -int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, char *path, int path_len TSRMLS_DC); -char *phar_find_in_include_path(char *file, int file_len, phar_archive_data **pphar TSRMLS_DC); -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, char **error TSRMLS_DC); -int phar_parse_metadata(char **buffer, zval *metadata, int zip_metadata_len TSRMLS_DC); +void phar_remove_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len); +void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len); +int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, char *path, int path_len); +char *phar_find_in_include_path(char *file, int file_len, phar_archive_data **pphar); +char *phar_fix_filepath(char *path, int *new_len, int use_cwd); +phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, char **error); +int phar_parse_metadata(char **buffer, zval *metadata, int zip_metadata_len); void destroy_phar_manifest_entry(zval *zv); -int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_off_t position, int follow_links TSRMLS_DC); -php_stream *phar_get_efp(phar_entry_info *entry, int follow_links TSRMLS_DC); -int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error TSRMLS_DC); -int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links TSRMLS_DC); -phar_entry_info *phar_get_link_source(phar_entry_info *entry TSRMLS_DC); -int phar_create_writeable_entry(phar_archive_data *phar, phar_entry_info *entry, char **error TSRMLS_DC); -int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC); -int phar_open_archive_fp(phar_archive_data *phar TSRMLS_DC); -int phar_copy_on_write(phar_archive_data **pphar TSRMLS_DC); +int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_off_t position, int follow_links); +php_stream *phar_get_efp(phar_entry_info *entry, int follow_links); +int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error); +int phar_open_entry_fp(phar_entry_info *entry, char **error, int follow_links); +phar_entry_info *phar_get_link_source(phar_entry_info *entry); +int phar_create_writeable_entry(phar_archive_data *phar, phar_entry_info *entry, char **error); +int phar_separate_entry_fp(phar_entry_info *entry, char **error); +int phar_open_archive_fp(phar_archive_data *phar); +int phar_copy_on_write(phar_archive_data **pphar); /* tar functions in tar.c */ int phar_is_tar(char *buf, char *fname); -int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, phar_archive_data** pphar, int is_data, php_uint32 compression, char **error TSRMLS_DC); -int phar_open_or_create_tar(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error TSRMLS_DC); -int phar_tar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int defaultstub, char **error TSRMLS_DC); +int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, phar_archive_data** pphar, int is_data, php_uint32 compression, char **error); +int phar_open_or_create_tar(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error); +int phar_tar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int defaultstub, char **error); /* zip functions in zip.c */ -int phar_parse_zipfile(php_stream *fp, char *fname, int fname_len, char *alias, int alias_len, phar_archive_data** pphar, char **error TSRMLS_DC); -int phar_open_or_create_zip(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error TSRMLS_DC); -int phar_zip_flush(phar_archive_data *archive, char *user_stub, zend_long len, int defaultstub, char **error TSRMLS_DC); +int phar_parse_zipfile(php_stream *fp, char *fname, int fname_len, char *alias, int alias_len, phar_archive_data** pphar, char **error); +int phar_open_or_create_zip(char *fname, int fname_len, char *alias, int alias_len, int is_data, int options, phar_archive_data** pphar, char **error); +int phar_zip_flush(phar_archive_data *archive, char *user_stub, zend_long len, int defaultstub, char **error); #ifdef PHAR_MAIN -static int phar_open_from_fp(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, int is_data, char **error TSRMLS_DC); +static int phar_open_from_fp(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, int is_data, char **error); extern php_stream_wrapper php_stream_phar_wrapper; #else extern HashTable cached_phars; extern HashTable cached_alias; #endif -int phar_archive_delref(phar_archive_data *phar TSRMLS_DC); -int phar_entry_delref(phar_entry_data *idata TSRMLS_DC); +int phar_archive_delref(phar_archive_data *phar); +int phar_entry_delref(phar_entry_data *idata); -phar_entry_info *phar_get_entry_info(phar_archive_data *phar, char *path, int path_len, char **error, int security TSRMLS_DC); -phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, int path_len, char dir, char **error, int security TSRMLS_DC); -phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char *path, int path_len, const char *mode, char allow_dir, char **error, int security TSRMLS_DC); -int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char *path, int path_len, const char *mode, char allow_dir, char **error, int security TSRMLS_DC); -int phar_flush(phar_archive_data *archive, char *user_stub, zend_long len, int convert, char **error TSRMLS_DC); -int phar_detect_phar_fname_ext(const char *filename, int filename_len, const char **ext_str, int *ext_len, int executable, int for_create, int is_complete TSRMLS_DC); -int phar_split_fname(const char *filename, int filename_len, char **arch, int *arch_len, char **entry, int *entry_len, int executable, int for_create TSRMLS_DC); +phar_entry_info *phar_get_entry_info(phar_archive_data *phar, char *path, int path_len, char **error, int security); +phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, int path_len, char dir, char **error, int security); +phar_entry_data *phar_get_or_create_entry_data(char *fname, int fname_len, char *path, int path_len, const char *mode, char allow_dir, char **error, int security); +int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char *path, int path_len, const char *mode, char allow_dir, char **error, int security); +int phar_flush(phar_archive_data *archive, char *user_stub, zend_long len, int convert, char **error); +int phar_detect_phar_fname_ext(const char *filename, int filename_len, const char **ext_str, int *ext_len, int executable, int for_create, int is_complete); +int phar_split_fname(const char *filename, int filename_len, char **arch, int *arch_len, char **entry, int *entry_len, int executable, int for_create); typedef enum { pcr_use_query, |