From: Greg Beaver Date: Fri, 30 May 2008 22:38:46 +0000 (+0000) Subject: refactor function names for clarity. No functionality change X-Git-Tag: BEFORE_NEW_PARAMETER_PARSE~126 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b600a72dc3ab4f4cbb1e583154732a34743ea28;p=php refactor function names for clarity. No functionality change --- diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index b411b5c1af..90f02fc2a1 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -309,7 +309,7 @@ php_stream *phar_wrapper_open_dir(php_stream_wrapper *wrapper, char *path, char phar_entry_info *entry = NULL; uint host_len; - if ((resource = phar_open_url(wrapper, path, mode, options TSRMLS_CC)) == NULL) { + if ((resource = phar_parse_url(wrapper, path, mode, options TSRMLS_CC)) == NULL) { php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar url \"%s\" is unknown", path); return NULL; } @@ -427,7 +427,7 @@ int phar_wrapper_mkdir(php_stream_wrapper *wrapper, char *url_from, int mode, in return FAILURE; } - if ((resource = phar_open_url(wrapper, url_from, "w", options TSRMLS_CC)) == NULL) { + if ((resource = phar_parse_url(wrapper, url_from, "w", options TSRMLS_CC)) == NULL) { return FAILURE; } @@ -546,7 +546,7 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, char *url, int options, php_ return FAILURE; } - if ((resource = phar_open_url(wrapper, url, "w", options TSRMLS_CC)) == NULL) { + if ((resource = phar_parse_url(wrapper, url, "w", options TSRMLS_CC)) == NULL) { return FAILURE; } diff --git a/ext/phar/dirstream.h b/ext/phar/dirstream.h index e7d0b40b58..6467b55bce 100644 --- a/ext/phar/dirstream.h +++ b/ext/phar/dirstream.h @@ -24,7 +24,7 @@ int phar_wrapper_mkdir(php_stream_wrapper *wrapper, char *url_from, int mode, in int phar_wrapper_rmdir(php_stream_wrapper *wrapper, char *url, int options, php_stream_context *context TSRMLS_DC); #ifdef PHAR_DIRSTREAM -php_url* phar_open_url(php_stream_wrapper *wrapper, char *filename, char *mode, int options TSRMLS_DC); +php_url* phar_parse_url(php_stream_wrapper *wrapper, char *filename, char *mode, int options TSRMLS_DC); /* directory handlers */ static size_t phar_dir_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC); diff --git a/ext/phar/phar.c b/ext/phar/phar.c index f38188e957..93a8cbb582 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -363,7 +363,7 @@ void phar_entry_remove(phar_entry_data *idata, char **error TSRMLS_DC) /* {{{ */ /** * Open an already loaded phar */ -int phar_open_loaded(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_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) /* {{{ */ { phar_archive_data *phar; #ifdef PHP_WIN32 @@ -489,10 +489,10 @@ static int phar_hex_str(const char *digest, size_t digest_len, char ** signature * Parse a new one and add it to the cache, returning either SUCCESS or * FAILURE, and setting pphar to the pointer to the manifest entry * - * This is used by phar_open_filename to process the manifest, but can be called + * This is used by phar_open_from_filename to process the manifest, but can be called * directly. */ -int phar_open_file(php_stream *fp, char *fname, int fname_len, char *alias, int alias_len, long halt_offset, phar_archive_data** pphar, php_uint32 compression, char **error TSRMLS_DC) /* {{{ */ +int phar_parse_pharfile(php_stream *fp, char *fname, int fname_len, char *alias, int alias_len, long halt_offset, phar_archive_data** pphar, php_uint32 compression, char **error TSRMLS_DC) /* {{{ */ { char b32[4], *buffer, *endbuffer, *savebuf; phar_archive_data *mydata = NULL; @@ -1001,7 +1001,7 @@ int phar_open_or_create_filename(char *fname, int fname_len, char *alias, int al } check_file: - if (phar_open_loaded(fname, fname_len, alias, alias_len, is_data, options, test, &my_error TSRMLS_CC) == SUCCESS) { + if (phar_open_parsed_phar(fname, fname_len, alias, alias_len, is_data, options, test, &my_error TSRMLS_CC) == SUCCESS) { if (pphar) { *pphar = *test; } @@ -1072,7 +1072,7 @@ int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int a } if (fp) { - if (phar_open_fp(fp, fname, fname_len, alias, alias_len, options, pphar, error TSRMLS_CC) == SUCCESS) { + if (phar_open_from_fp(fp, fname, fname_len, alias, alias_len, options, pphar, error TSRMLS_CC) == SUCCESS) { if ((*pphar)->is_data || !PHAR_G(readonly)) { (*pphar)->is_writeable = 1; } @@ -1182,10 +1182,10 @@ int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int a * Return an already opened filename. * * Or scan a phar file for the required __HALT_COMPILER(); ?> token and verify - * that the manifest is proper, then pass it to phar_open_file(). SUCCESS + * that the manifest is proper, then pass it to phar_parse_pharfile(). SUCCESS * or FAILURE is returned and pphar is set to a pointer to the phar's manifest */ -int phar_open_filename(char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, char **error 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) /* {{{ */ { php_stream *fp; char *actual; @@ -1199,7 +1199,7 @@ int phar_open_filename(char *fname, int fname_len, char *alias, int alias_len, i is_data = 1; } - if (phar_open_loaded(fname, fname_len, alias, alias_len, is_data, options, pphar, error TSRMLS_CC) == SUCCESS) { + if (phar_open_parsed_phar(fname, fname_len, alias, alias_len, is_data, options, pphar, error TSRMLS_CC) == SUCCESS) { return SUCCESS; } else if (error && *error) { return FAILURE; @@ -1233,7 +1233,7 @@ int phar_open_filename(char *fname, int fname_len, char *alias, int alias_len, i fname_len = strlen(actual); } - ret = phar_open_fp(fp, fname, fname_len, alias, alias_len, options, pphar, error TSRMLS_CC); + ret = phar_open_from_fp(fp, fname, fname_len, alias, alias_len, options, pphar, error TSRMLS_CC); if (actual) { efree(actual); } @@ -1264,10 +1264,10 @@ static inline char *phar_strnstr(const char *buf, int buf_len, const char *searc /** * Scan an open fp for the required __HALT_COMPILER(); ?> token and verify - * that the manifest is proper, then pass it to phar_open_file(). SUCCESS + * that the manifest is proper, then pass it to phar_parse_pharfile(). SUCCESS * or FAILURE is returned and pphar is set to a pointer to the phar's manifest */ -static int phar_open_fp(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, 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, char **error TSRMLS_DC) /* {{{ */ { const char token[] = "__HALT_COMPILER();"; const char zip_magic[] = "PK\x03\x04"; @@ -1389,18 +1389,18 @@ static int phar_open_fp(php_stream* fp, char *fname, int fname_len, char *alias, } if (!memcmp(pos, zip_magic, 4)) { php_stream_seek(fp, 0, SEEK_END); - return phar_open_zipfile(fp, fname, fname_len, alias, alias_len, pphar, error TSRMLS_CC); + return phar_parse_zipfile(fp, fname, fname_len, alias, alias_len, pphar, error TSRMLS_CC); } if (got > 512) { if (phar_is_tar(pos, fname)) { php_stream_rewind(fp); - return phar_open_tarfile(fp, fname, fname_len, alias, alias_len, options, pphar, compression, error TSRMLS_CC); + return phar_parse_tarfile(fp, fname, fname_len, alias, alias_len, options, pphar, compression, error TSRMLS_CC); } } } if ((pos = phar_strnstr(buffer, 1024 + sizeof(token), token, sizeof(token)-1)) != NULL) { halt_offset += (pos - buffer); /* no -tokenlen+tokenlen here */ - return phar_open_file(fp, fname, fname_len, alias, alias_len, halt_offset, pphar, compression, error TSRMLS_CC); + return phar_parse_pharfile(fp, fname, fname_len, alias, alias_len, halt_offset, pphar, compression, error TSRMLS_CC); } halt_offset += got; @@ -1814,7 +1814,7 @@ char *phar_fix_filepath(char *path, int *new_len, int use_cwd TSRMLS_DC) /* {{{ * * Optionally the name might start with 'phar://' * - * This is used by phar_open_url() + * This is used by phar_parse_url() */ int phar_split_fname(char *filename, int filename_len, char **arch, int *arch_len, char **entry, int *entry_len, int executable, int for_create TSRMLS_DC) /* {{{ */ { @@ -1879,7 +1879,7 @@ int phar_split_fname(char *filename, int filename_len, char **arch, int *arch_le * Invoked when a user calls Phar::mapPhar() from within an executing .phar * to set up its manifest directly */ -int phar_open_compiled_file(char *alias, int alias_len, char **error TSRMLS_DC) /* {{{ */ +int phar_open_executed_filename(char *alias, int alias_len, char **error TSRMLS_DC) /* {{{ */ { char *fname; long halt_offset; @@ -1895,7 +1895,7 @@ int phar_open_compiled_file(char *alias, int alias_len, char **error TSRMLS_DC) fname = zend_get_executed_filename(TSRMLS_C); fname_len = strlen(fname); - if (phar_open_loaded(fname, fname_len, alias, alias_len, 0, REPORT_ERRORS, NULL, 0 TSRMLS_CC) == SUCCESS) { + if (phar_open_parsed_phar(fname, fname_len, alias, alias_len, 0, REPORT_ERRORS, NULL, 0 TSRMLS_CC) == SUCCESS) { return SUCCESS; } @@ -1944,7 +1944,7 @@ int phar_open_compiled_file(char *alias, int alias_len, char **error TSRMLS_DC) fname_len = strlen(actual); } - ret = phar_open_fp(fp, fname, fname_len, alias, alias_len, REPORT_ERRORS, NULL, error TSRMLS_CC); + ret = phar_open_from_fp(fp, fname, fname_len, alias, alias_len, REPORT_ERRORS, NULL, error TSRMLS_CC); if (actual) { efree(actual); } @@ -2855,7 +2855,7 @@ static zend_op_array *phar_compile_file(zend_file_handle *file_handle, int type phar_archive_data *phar; if (strstr(file_handle->filename, ".phar") && !strstr(file_handle->filename, "://")) { - if (SUCCESS == phar_open_filename(file_handle->filename, strlen(file_handle->filename), NULL, 0, 0, &phar, NULL TSRMLS_CC)) { + if (SUCCESS == phar_open_from_filename(file_handle->filename, strlen(file_handle->filename), NULL, 0, 0, &phar, NULL TSRMLS_CC)) { if (phar->is_zip || phar->is_tar) { zend_file_handle f = *file_handle; diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index b467fbe2d8..9005ca84eb 100755 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -398,13 +398,13 @@ void phar_object_init(TSRMLS_D); void phar_destroy_phar_data(phar_archive_data *phar TSRMLS_DC); int phar_open_entry_file(phar_archive_data *phar, phar_entry_info *entry, char **error TSRMLS_DC); -int phar_open_filename(char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, char **error 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_compiled_file(char *alias, int alias_len, 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_loaded(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_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); /* utility functions */ char *phar_create_default_stub(const char *index_php, const char *web_index, size_t *len, char **error TSRMLS_DC); @@ -429,17 +429,17 @@ int phar_open_archive_fp(phar_archive_data *phar TSRMLS_DC); /* tar functions in tar.c */ int phar_is_tar(char *buf, char *fname); -int phar_open_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, php_uint32 compression, char **error TSRMLS_DC); +int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, 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, long len, int defaultstub, char **error TSRMLS_DC); /* zip functions in zip.c */ -int phar_open_zipfile(php_stream *fp, char *fname, int fname_len, char *alias, int alias_len, phar_archive_data** pphar, 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 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, long len, int defaultstub, char **error TSRMLS_DC); #ifdef PHAR_MAIN -static int phar_open_fp(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, 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, char **error TSRMLS_DC); extern php_stream_wrapper php_stream_phar_wrapper; #endif diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 8f0a3f90e9..4ca68a0bcc 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -530,7 +530,7 @@ PHP_METHOD(Phar, webPhar) phar_request_initialize(TSRMLS_C); fname = zend_get_executed_filename(TSRMLS_C); fname_len = strlen(fname); - if (phar_open_compiled_file(alias, alias_len, &error TSRMLS_CC) != SUCCESS) { + if (phar_open_executed_filename(alias, alias_len, &error TSRMLS_CC) != SUCCESS) { if (error) { zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error); efree(error); @@ -979,7 +979,7 @@ PHP_METHOD(Phar, mapPhar) phar_request_initialize(TSRMLS_C); - RETVAL_BOOL(phar_open_compiled_file(alias, alias_len, &error TSRMLS_CC) == SUCCESS); + RETVAL_BOOL(phar_open_executed_filename(alias, alias_len, &error TSRMLS_CC) == SUCCESS); if (error) { zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error); efree(error); @@ -999,7 +999,7 @@ PHP_METHOD(Phar, loadPhar) phar_request_initialize(TSRMLS_C); - RETVAL_BOOL(phar_open_filename(fname, fname_len, alias, alias_len, REPORT_ERRORS, NULL, &error TSRMLS_CC) == SUCCESS); + RETVAL_BOOL(phar_open_from_filename(fname, fname_len, alias, alias_len, REPORT_ERRORS, NULL, &error TSRMLS_CC) == SUCCESS); if (error) { zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, error); efree(error); @@ -1289,7 +1289,7 @@ PHP_METHOD(Phar, unlinkArchive) return; } - if (FAILURE == phar_open_filename(fname, fname_len, NULL, 0, REPORT_ERRORS, &phar, &error TSRMLS_CC)) { + if (FAILURE == phar_open_from_filename(fname, fname_len, NULL, 0, REPORT_ERRORS, &phar, &error TSRMLS_CC)) { if (error) { zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "Unknown phar archive \"%s\": %s", fname, error); efree(error); @@ -3939,7 +3939,7 @@ PHP_METHOD(PharFileInfo, __construct) return; } - if (phar_open_filename(arch, arch_len, NULL, 0, REPORT_ERRORS, &phar_data, &error TSRMLS_CC) == FAILURE) { + if (phar_open_from_filename(arch, arch_len, NULL, 0, REPORT_ERRORS, &phar_data, &error TSRMLS_CC) == FAILURE) { efree(arch); efree(entry); if (error) { diff --git a/ext/phar/stream.c b/ext/phar/stream.c index 3bd2bd935d..32add212d1 100644 --- a/ext/phar/stream.c +++ b/ext/phar/stream.c @@ -56,7 +56,7 @@ php_stream_wrapper php_stream_phar_wrapper = { /** * Open a phar file for streams API */ -php_url* phar_open_url(php_stream_wrapper *wrapper, char *filename, char *mode, int options TSRMLS_DC) /* {{{ */ +php_url* phar_parse_url(php_stream_wrapper *wrapper, char *filename, char *mode, int options TSRMLS_DC) /* {{{ */ { php_url *resource; char *arch = NULL, *entry = NULL, *error; @@ -125,7 +125,7 @@ php_url* phar_open_url(php_stream_wrapper *wrapper, char *filename, char *mode, return NULL; } } else { - if (phar_open_filename(resource->host, arch_len, NULL, 0, options, NULL, &error TSRMLS_CC) == FAILURE) + if (phar_open_from_filename(resource->host, arch_len, NULL, 0, options, NULL, &error TSRMLS_CC) == FAILURE) { if (error) { if (!(options & PHP_STREAM_URL_STAT_QUIET)) { @@ -155,7 +155,7 @@ static php_stream * phar_wrapper_open_url(php_stream_wrapper *wrapper, char *pat zval **pzoption, *metadata; uint host_len; - if ((resource = phar_open_url(wrapper, path, mode, options TSRMLS_CC)) == NULL) { + if ((resource = phar_parse_url(wrapper, path, mode, options TSRMLS_CC)) == NULL) { return NULL; } @@ -511,7 +511,7 @@ static int phar_wrapper_stat(php_stream_wrapper *wrapper, char *url, int flags, uint host_len; int internal_file_len; - if ((resource = phar_open_url(wrapper, url, "r", flags|PHP_STREAM_URL_STAT_QUIET TSRMLS_CC)) == NULL) { + if ((resource = phar_parse_url(wrapper, url, "r", flags|PHP_STREAM_URL_STAT_QUIET TSRMLS_CC)) == NULL) { return FAILURE; } @@ -644,7 +644,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, char *url, int optio phar_archive_data **pphar; uint host_len; - if ((resource = phar_open_url(wrapper, url, "rb", options TSRMLS_CC)) == NULL) { + if ((resource = phar_parse_url(wrapper, url, "rb", options TSRMLS_CC)) == NULL) { php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: unlink failed"); return 0; } @@ -720,7 +720,7 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char error = NULL; - if ((resource_from = phar_open_url(wrapper, url_from, "wb", options|PHP_STREAM_URL_STAT_QUIET TSRMLS_CC)) == NULL) { + if ((resource_from = phar_parse_url(wrapper, url_from, "wb", options|PHP_STREAM_URL_STAT_QUIET TSRMLS_CC)) == NULL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "phar error: cannot rename \"%s\" to \"%s\": invalid or non-writable url \"%s\"", url_from, url_to, url_from); return 0; } @@ -736,7 +736,7 @@ static int phar_wrapper_rename(php_stream_wrapper *wrapper, char *url_from, char return 0; } - if ((resource_to = phar_open_url(wrapper, url_to, "wb", options|PHP_STREAM_URL_STAT_QUIET TSRMLS_CC)) == NULL) { + if ((resource_to = phar_parse_url(wrapper, url_to, "wb", options|PHP_STREAM_URL_STAT_QUIET TSRMLS_CC)) == NULL) { php_url_free(resource_from); php_error_docref(NULL TSRMLS_CC, E_WARNING, "phar error: cannot rename \"%s\" to \"%s\": invalid or non-writable url \"%s\"", url_from, url_to, url_to); return 0; diff --git a/ext/phar/stream.h b/ext/phar/stream.h index f273acb0aa..49f6b612f1 100644 --- a/ext/phar/stream.h +++ b/ext/phar/stream.h @@ -22,7 +22,7 @@ BEGIN_EXTERN_C() int phar_postprocess_file(php_stream_wrapper *wrapper, int options, phar_entry_data *idata, php_uint32 crc32, char **error TSRMLS_DC); -php_url* phar_open_url(php_stream_wrapper *wrapper, char *filename, char *mode, int options TSRMLS_DC); +php_url* phar_parse_url(php_stream_wrapper *wrapper, char *filename, char *mode, int options TSRMLS_DC); void phar_entry_remove(phar_entry_data *idata, char **error TSRMLS_DC); static php_stream* phar_wrapper_open_url(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); diff --git a/ext/phar/tar.c b/ext/phar/tar.c index 32d2261db5..b3d69cc88f 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -187,7 +187,7 @@ int phar_tar_process_metadata(phar_entry_info *entry, php_stream *fp TSRMLS_DC) return SUCCESS; } -int phar_open_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, php_uint32 compression, char **error TSRMLS_DC) /* {{{ */ +int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias, int alias_len, int options, phar_archive_data** pphar, php_uint32 compression, char **error TSRMLS_DC) /* {{{ */ { char buf[512], *actual_alias = NULL, *p; phar_entry_info entry = {0}; diff --git a/ext/phar/zip.c b/ext/phar/zip.c index 6cd4a5a722..383a90d7f6 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -140,10 +140,10 @@ static void phar_zip_u2d_time(time_t time, php_uint16 *dtime, php_uint16 *ddate) * Parse a new one and add it to the cache, returning either SUCCESS or * FAILURE, and setting pphar to the pointer to the manifest entry * - * This is used by phar_open_fp to process a zip-based phar, but can be called + * This is used by phar_open_from_fp to process a zip-based phar, but can be called * directly. */ -int phar_open_zipfile(php_stream *fp, char *fname, int fname_len, char *alias, int alias_len, phar_archive_data** pphar, 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 TSRMLS_DC) /* {{{ */ { phar_zip_dir_end locator; char buf[sizeof(locator) + 65536];