master renames phase 1

1 files changed, 35 insertions, 35 deletions

diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index b548516fc7..99bc98bc5b 100644
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -98,8 +98,8 @@ PHAR_FUNC(phar_file_get_contents) /* {{{ */
 	zend_string *contents;
 	zend_bool use_include_path = 0;
 	php_stream *stream;
-	php_int_t offset = -1;
-	php_int_t maxlen = PHP_STREAM_COPY_ALL;
+	zend_long offset = -1;
+	zend_long maxlen = PHP_STREAM_COPY_ALL;
 	zval *zcontext = NULL;
 
 	if (!PHAR_G(intercepted)) {
@@ -112,7 +112,7 @@ PHAR_FUNC(phar_file_get_contents) /* {{{ */
 	}
 
 	/* Parse arguments */
-	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "p|br!ii", &filename, &filename_len, &use_include_path, &zcontext, &offset, &maxlen) == FAILURE) {
+	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "p|br!ll", &filename, &filename_len, &use_include_path, &zcontext, &offset, &maxlen) == FAILURE) {
 		goto skip_phar;
 	}
 
@@ -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;
@@ -307,7 +307,7 @@ notfound:
 		}
 		size = php_stream_passthru(stream);
 		php_stream_close(stream);
-		RETURN_INT(size);
+		RETURN_LONG(size);
 	}
 
 skip_phar:
@@ -477,32 +477,32 @@ static void phar_fancy_stat(php_stat_t *stat_sb, int type, zval *return_value TS
 
 	switch (type) {
 	case FS_PERMS:
-		RETURN_INT((php_int_t)stat_sb->st_mode);
+		RETURN_LONG((zend_long)stat_sb->st_mode);
 	case FS_INODE:
-		RETURN_INT((php_int_t)stat_sb->st_ino);
+		RETURN_LONG((zend_long)stat_sb->st_ino);
 	case FS_SIZE:
-		RETURN_INT((php_int_t)stat_sb->st_size);
+		RETURN_LONG((zend_long)stat_sb->st_size);
 	case FS_OWNER:
-		RETURN_INT((php_int_t)stat_sb->st_uid);
+		RETURN_LONG((zend_long)stat_sb->st_uid);
 	case FS_GROUP:
-		RETURN_INT((php_int_t)stat_sb->st_gid);
+		RETURN_LONG((zend_long)stat_sb->st_gid);
 	case FS_ATIME:
 #ifdef NETWARE
-		RETURN_INT((php_int_t)stat_sb->st_atime.tv_sec);
+		RETURN_LONG((zend_long)stat_sb->st_atime.tv_sec);
 #else
-		RETURN_INT((php_int_t)stat_sb->st_atime);
+		RETURN_LONG((zend_long)stat_sb->st_atime);
 #endif
 	case FS_MTIME:
 #ifdef NETWARE
-		RETURN_INT((php_int_t)stat_sb->st_mtime.tv_sec);
+		RETURN_LONG((zend_long)stat_sb->st_mtime.tv_sec);
 #else
-		RETURN_INT((php_int_t)stat_sb->st_mtime);
+		RETURN_LONG((zend_long)stat_sb->st_mtime);
 #endif
 	case FS_CTIME:
 #ifdef NETWARE
-		RETURN_INT((php_int_t)stat_sb->st_ctime.tv_sec);
+		RETURN_LONG((zend_long)stat_sb->st_ctime.tv_sec);
 #else
-		RETURN_INT((php_int_t)stat_sb->st_ctime);
+		RETURN_LONG((zend_long)stat_sb->st_ctime);
 #endif
 	case FS_TYPE:
 		if (S_ISLNK(stat_sb->st_mode)) {
@@ -533,36 +533,36 @@ static void phar_fancy_stat(php_stat_t *stat_sb, int type, zval *return_value TS
 	case FS_STAT:
 		array_init(return_value);
 
-		ZVAL_INT(&stat_dev, stat_sb->st_dev);
-		ZVAL_INT(&stat_ino, stat_sb->st_ino);
-		ZVAL_INT(&stat_mode, stat_sb->st_mode);
-		ZVAL_INT(&stat_nlink, stat_sb->st_nlink);
-		ZVAL_INT(&stat_uid, stat_sb->st_uid);
-		ZVAL_INT(&stat_gid, stat_sb->st_gid);
+		ZVAL_LONG(&stat_dev, stat_sb->st_dev);
+		ZVAL_LONG(&stat_ino, stat_sb->st_ino);
+		ZVAL_LONG(&stat_mode, stat_sb->st_mode);
+		ZVAL_LONG(&stat_nlink, stat_sb->st_nlink);
+		ZVAL_LONG(&stat_uid, stat_sb->st_uid);
+		ZVAL_LONG(&stat_gid, stat_sb->st_gid);
 #ifdef HAVE_ST_RDEV
-		ZVAL_INT(&stat_rdev, stat_sb->st_rdev);
+		ZVAL_LONG(&stat_rdev, stat_sb->st_rdev);
 #else
-		ZVAL_INT(&stat_rdev, -1);
+		ZVAL_LONG(&stat_rdev, -1);
 #endif
-		ZVAL_INT(&stat_size, stat_sb->st_size);
+		ZVAL_LONG(&stat_size, stat_sb->st_size);
 #ifdef NETWARE
-		ZVAL_INT(&stat_atime, (stat_sb->st_atime).tv_sec);
-		ZVAL_INT(&stat_mtime, (stat_sb->st_mtime).tv_sec);
-		ZVAL_INT(&stat_ctime, (stat_sb->st_ctime).tv_sec);
+		ZVAL_LONG(&stat_atime, (stat_sb->st_atime).tv_sec);
+		ZVAL_LONG(&stat_mtime, (stat_sb->st_mtime).tv_sec);
+		ZVAL_LONG(&stat_ctime, (stat_sb->st_ctime).tv_sec);
 #else
-		ZVAL_INT(&stat_atime, stat_sb->st_atime);
-		ZVAL_INT(&stat_mtime, stat_sb->st_mtime);
-		ZVAL_INT(&stat_ctime, stat_sb->st_ctime);
+		ZVAL_LONG(&stat_atime, stat_sb->st_atime);
+		ZVAL_LONG(&stat_mtime, stat_sb->st_mtime);
+		ZVAL_LONG(&stat_ctime, stat_sb->st_ctime);
 #endif
 #ifdef HAVE_ST_BLKSIZE
-		ZVAL_INT(&stat_blksize, stat_sb->st_blksize);
+		ZVAL_LONG(&stat_blksize, stat_sb->st_blksize);
 #else
-		ZVAL_INT(&stat_blksize,-1);
+		ZVAL_LONG(&stat_blksize,-1);
 #endif
 #ifdef HAVE_ST_BLOCKS
-		ZVAL_INT(&stat_blocks, stat_sb->st_blocks);
+		ZVAL_LONG(&stat_blocks, stat_sb->st_blocks);
 #else
-		ZVAL_INT(&stat_blocks,-1);
+		ZVAL_LONG(&stat_blocks,-1);
 #endif
 		/* Store numeric indexes in propper order */
 		zend_hash_next_index_insert(HASH_OF(return_value), &stat_dev);