summaryrefslogtreecommitdiff
path: root/ext/phar/func_interceptors.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/phar/func_interceptors.c')
-rw-r--r--ext/phar/func_interceptors.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index 392f7d73ab..6d6cbc4918 100644
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -26,7 +26,7 @@
PHAR_FUNC(phar_opendir) /* {{{ */
{
char *filename;
- int filename_len;
+ size_t filename_len;
zval *zcontext = NULL;
if (!PHAR_G(intercepted)) {
@@ -94,12 +94,12 @@ skip_phar:
PHAR_FUNC(phar_file_get_contents) /* {{{ */
{
char *filename;
- int filename_len;
+ size_t filename_len;
zend_string *contents;
zend_bool use_include_path = 0;
php_stream *stream;
- long offset = -1;
- long maxlen = PHP_STREAM_COPY_ALL;
+ zend_long offset = -1;
+ zend_long maxlen = PHP_STREAM_COPY_ALL;
zval *zcontext = NULL;
if (!PHAR_G(intercepted)) {
@@ -195,7 +195,7 @@ phar_it:
}
if (offset > 0 && php_stream_seek(stream, offset, SEEK_SET) < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", offset);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %pd in the stream", offset);
php_stream_close(stream);
RETURN_FALSE;
}
@@ -205,7 +205,7 @@ phar_it:
if (contents && contents->len > 0) {
RETVAL_STR(contents);
} else if (contents) {
- STR_RELEASE(contents);
+ zend_string_release(contents);
RETVAL_EMPTY_STRING();
} else {
RETVAL_FALSE;
@@ -224,7 +224,7 @@ skip_phar:
PHAR_FUNC(phar_readfile) /* {{{ */
{
char *filename;
- int filename_len;
+ size_t filename_len;
int size = 0;
zend_bool use_include_path = 0;
zval *zcontext = NULL;
@@ -320,7 +320,7 @@ skip_phar:
PHAR_FUNC(phar_fopen) /* {{{ */
{
char *filename, *mode;
- int filename_len, mode_len;
+ size_t filename_len, mode_len;
zend_bool use_include_path = 0;
zval *zcontext = NULL;
php_stream *stream;
@@ -339,7 +339,7 @@ PHAR_FUNC(phar_fopen) /* {{{ */
}
if (use_include_path || (!IS_ABSOLUTE_PATH(filename, filename_len) && !strstr(filename, "://"))) {
char *arch, *entry, *fname;
- int arch_len, entry_len, fname_len;
+ size_t arch_len, entry_len, fname_len;
php_stream_context *context = NULL;
char *name;
phar_archive_data *phar;
@@ -349,7 +349,7 @@ PHAR_FUNC(phar_fopen) /* {{{ */
goto skip_phar;
}
fname_len = strlen(fname);
- if (FAILURE == phar_split_fname(fname, fname_len, &arch, &arch_len, &entry, &entry_len, 2, 0 TSRMLS_CC)) {
+ if (FAILURE == phar_split_fname(fname, fname_len, &arch, (int *)&arch_len, &entry, (int *)&entry_len, 2, 0 TSRMLS_CC)) {
goto skip_phar;
}
@@ -371,7 +371,7 @@ PHAR_FUNC(phar_fopen) /* {{{ */
name = entry;
}
} else {
- entry = phar_fix_filepath(estrndup(entry, entry_len), &entry_len, 1 TSRMLS_CC);
+ entry = phar_fix_filepath(estrndup(entry, entry_len), (int *)&entry_len, 1 TSRMLS_CC);
if (entry[0] == '/') {
if (!zend_hash_str_exists(&(phar->manifest), entry + 1, entry_len - 1)) {
/* this file is not in the phar, use the original path */
@@ -433,7 +433,7 @@ skip_phar:
/* {{{ php_stat
*/
-static void phar_fancy_stat(struct stat *stat_sb, int type, zval *return_value TSRMLS_DC)
+static void phar_fancy_stat(zend_stat_t *stat_sb, int type, zval *return_value TSRMLS_DC)
{
zval stat_dev, stat_ino, stat_mode, stat_nlink, stat_uid, stat_gid, stat_rdev,
stat_size, stat_atime, stat_mtime, stat_ctime, stat_blksize, stat_blocks;
@@ -477,32 +477,32 @@ static void phar_fancy_stat(struct stat *stat_sb, int type, zval *return_value T
switch (type) {
case FS_PERMS:
- RETURN_LONG((long)stat_sb->st_mode);
+ RETURN_LONG((zend_long)stat_sb->st_mode);
case FS_INODE:
- RETURN_LONG((long)stat_sb->st_ino);
+ RETURN_LONG((zend_long)stat_sb->st_ino);
case FS_SIZE:
- RETURN_LONG((long)stat_sb->st_size);
+ RETURN_LONG((zend_long)stat_sb->st_size);
case FS_OWNER:
- RETURN_LONG((long)stat_sb->st_uid);
+ RETURN_LONG((zend_long)stat_sb->st_uid);
case FS_GROUP:
- RETURN_LONG((long)stat_sb->st_gid);
+ RETURN_LONG((zend_long)stat_sb->st_gid);
case FS_ATIME:
#ifdef NETWARE
- RETURN_LONG((long)stat_sb->st_atime.tv_sec);
+ RETURN_LONG((zend_long)stat_sb->st_atime.tv_sec);
#else
- RETURN_LONG((long)stat_sb->st_atime);
+ RETURN_LONG((zend_long)stat_sb->st_atime);
#endif
case FS_MTIME:
#ifdef NETWARE
- RETURN_LONG((long)stat_sb->st_mtime.tv_sec);
+ RETURN_LONG((zend_long)stat_sb->st_mtime.tv_sec);
#else
- RETURN_LONG((long)stat_sb->st_mtime);
+ RETURN_LONG((zend_long)stat_sb->st_mtime);
#endif
case FS_CTIME:
#ifdef NETWARE
- RETURN_LONG((long)stat_sb->st_ctime.tv_sec);
+ RETURN_LONG((zend_long)stat_sb->st_ctime.tv_sec);
#else
- RETURN_LONG((long)stat_sb->st_ctime);
+ RETURN_LONG((zend_long)stat_sb->st_ctime);
#endif
case FS_TYPE:
if (S_ISLNK(stat_sb->st_mode)) {
@@ -611,7 +611,7 @@ static void phar_file_stat(const char *filename, php_stat_len filename_length, i
if (!IS_ABSOLUTE_PATH(filename, filename_length) && !strstr(filename, "://")) {
char *arch, *entry, *fname;
int arch_len, entry_len, fname_len;
- struct stat sb = {0};
+ zend_stat_t sb = {0};
phar_entry_info *data = NULL;
phar_archive_data *phar;
@@ -805,7 +805,7 @@ void fname(INTERNAL_FUNCTION_PARAMETERS) { \
PHAR_G(orig)(INTERNAL_FUNCTION_PARAM_PASSTHRU); \
} else { \
char *filename; \
- int filename_len; \
+ size_t filename_len; \
\
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &filename, &filename_len) == FAILURE) { \
return; \
@@ -889,7 +889,7 @@ PharFileFunction(phar_is_dir, FS_IS_DIR, orig_is_dir)
PHAR_FUNC(phar_is_file) /* {{{ */
{
char *filename;
- int filename_len;
+ size_t filename_len;
if (!PHAR_G(intercepted)) {
goto skip_phar;
@@ -956,7 +956,7 @@ skip_phar:
PHAR_FUNC(phar_is_link) /* {{{ */
{
char *filename;
- int filename_len;
+ size_t filename_len;
if (!PHAR_G(intercepted)) {
goto skip_phar;
View Lorry Controller Status