diff options
Diffstat (limited to 'ext/phar/util.c')
| -rw-r--r-- | ext/phar/util.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index 9797ec8250..d5b6a5dd13 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -156,7 +156,6 @@ int phar_seek_efp(phar_entry_info *entry, off_t offset, int whence, off_t positi break; default: temp = 0; - break; } if (temp > eoffset + (off_t) entry->uncompressed_filesize) { @@ -274,7 +273,7 @@ char *phar_find_in_include_path(char *filename, int filename_len, phar_archive_d return phar_save_resolve_path(filename, filename_len TSRMLS_CC); } - fname = zend_get_executed_filename(TSRMLS_C); + fname = (char*)zend_get_executed_filename(TSRMLS_C); fname_len = strlen(fname); if (PHAR_G(last_phar) && !memcmp(fname, "phar://", 7) && fname_len - 7 >= PHAR_G(last_phar_name_len) && !memcmp(fname + 7, PHAR_G(last_phar_name), PHAR_G(last_phar_name_len))) { @@ -366,7 +365,7 @@ splitted: goto doit; } - fname = zend_get_executed_filename(TSRMLS_C); + fname = (char*)zend_get_executed_filename(TSRMLS_C); if (SUCCESS != phar_split_fname(fname, strlen(fname), &arch, &arch_len, &entry, &entry_len, 1, 0 TSRMLS_CC)) { goto doit; @@ -524,7 +523,7 @@ not_stream: /* check in calling scripts' current working directory as a fall back case */ if (zend_is_executing(TSRMLS_C)) { - char *exec_fname = zend_get_executed_filename(TSRMLS_C); + char *exec_fname = (char*)zend_get_executed_filename(TSRMLS_C); int exec_fname_length = strlen(exec_fname); const char *p; int n = 0; @@ -2218,7 +2217,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, int filename_len TSRMLS_DC) /* {{{ */ { - char *s; + const char *s; while ((s = zend_memrchr(filename, '/', filename_len))) { filename_len = s - filename; |