next wave of revamp in Zend

Author: weltling

Zend/zend_API.c

@@ -3430,7 +3430,7 @@ ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *f
 ZEND_API const char *zend_get_module_version(const char *module_name) /* {{{ */
 {
 	char *lname;
-	int name_len = strlen(module_name);
+	zend_size_t name_len = strlen(module_name);
 	zend_module_entry *module;
 
 	lname = zend_str_tolower_dup(module_name, name_len);

Zend/zend_alloc.c

@@ -1745,7 +1745,7 @@ static void zend_mm_safe_error(zend_mm_heap *heap,
 	size_t limit,
 #if ZEND_DEBUG
 	const char *filename,
-	uint lineno,
+	zend_uint_t lineno,
 #endif
 	size_t size)
 {

Zend/zend_compile.c

@@ -271,7 +271,7 @@ ZEND_API char *zend_get_compiled_filename(TSRMLS_D) /* {{{ */
 }
 /* }}} */
 
-ZEND_API zend_size_t zend_get_compiled_lineno(TSRMLS_D) /* {{{ */
+ZEND_API zend_uint_t zend_get_compiled_lineno(TSRMLS_D) /* {{{ */
 {
 	return CG(zend_lineno);
 }

Zend/zend_compile.h

@@ -445,7 +445,7 @@ void shutdown_scanner(TSRMLS_D);
 ZEND_API char *zend_set_compiled_filename(const char *new_compiled_filename TSRMLS_DC);
 ZEND_API void zend_restore_compiled_filename(char *original_compiled_filename TSRMLS_DC);
 ZEND_API char *zend_get_compiled_filename(TSRMLS_D);
-ZEND_API zend_size_t zend_get_compiled_lineno(TSRMLS_D);
+ZEND_API zend_uint_t zend_get_compiled_lineno(TSRMLS_D);
 ZEND_API size_t zend_get_scanned_file_offset(TSRMLS_D);
 
 void zend_resolve_non_class_name(znode *element_name, zend_bool *check_namespace, zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC);
@@ -715,7 +715,7 @@ int zend_get_class_fetch_type(const char *class_name, zend_size_t class_name_len
 typedef zend_bool (*zend_auto_global_callback)(const char *name, zend_size_t name_len TSRMLS_DC);
 typedef struct _zend_auto_global {
 	const char *name;
-	uint name_len;
+	zend_size_t name_len;
 	zend_auto_global_callback auto_global_callback;
 	zend_bool jit;
 	zend_bool armed;

Zend/zend_exceptions.c

@@ -510,7 +510,7 @@ static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list arg
 	TRACE_APPEND_CHR('(');
 	if (zend_hash_find(ht, "args", sizeof("args"), (void**)&tmp) == SUCCESS) {
 		if (Z_TYPE_PP(tmp) == IS_ARRAY) {
-			int last_len = *len;
+			zend_size_t last_len = *len;
 			zend_hash_apply_with_arguments(Z_ARRVAL_PP(tmp) TSRMLS_CC, (apply_func_args_t)_build_trace_args, 2, str, len);
 			if (last_len != *len) {
 				*len -= 2; /* remove last ', ' */

Zend/zend_globals.h

@@ -87,7 +87,7 @@ struct _zend_compiler_globals {
 
 	char *compiled_filename;
 
-	int zend_lineno;
+	zend_uint_t zend_lineno;
 
 	zend_op_array *active_op_array;
 

Zend/zend_ini.c

@@ -460,7 +460,8 @@ static void zend_ini_displayer_cb(zend_ini_entry *ini_entry, int type) /* {{{ */
 
 ZEND_INI_DISP(zend_ini_boolean_displayer_cb) /* {{{ */
 {
-	int value, tmp_value_len;
+	int value;
+	zend_size_t tmp_value_len;
 	char *tmp_value;
 
 	if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {

Zend/zend_llist.c

@@ -249,7 +249,7 @@ ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_ar
 }
 
 
-ZEND_API int zend_llist_count(zend_llist *l)
+ZEND_API size_t zend_llist_count(zend_llist *l)
 {
 	return l->count;
 }

Zend/zend_llist.h

@@ -59,7 +59,7 @@ ZEND_API void zend_llist_apply(zend_llist *l, llist_apply_func_t func TSRMLS_DC)
 ZEND_API void zend_llist_apply_with_del(zend_llist *l, int (*func)(void *data));
 ZEND_API void zend_llist_apply_with_argument(zend_llist *l, llist_apply_with_arg_func_t func, void *arg TSRMLS_DC);
 ZEND_API void zend_llist_apply_with_arguments(zend_llist *l, llist_apply_with_args_func_t func TSRMLS_DC, int num_args, ...);
-ZEND_API int zend_llist_count(zend_llist *l);
+ZEND_API size_t zend_llist_count(zend_llist *l);
 ZEND_API void zend_llist_sort(zend_llist *l, llist_compare_func_t comp_func TSRMLS_DC);
 
 /* traversal */

Zend/zend_object_handlers.c

@@ -1124,7 +1124,7 @@ ZEND_API void zend_std_callstatic_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{
 }
 /* }}} */
 
-static inline union _zend_function *zend_get_user_callstatic_function(zend_class_entry *ce, const char *method_name, int method_len) /* {{{ */
+static inline union _zend_function *zend_get_user_callstatic_function(zend_class_entry *ce, const char *method_name, zend_size_t method_len) /* {{{ */
 {
 	zend_internal_function *callstatic_user_call = emalloc(sizeof(zend_internal_function));
 	callstatic_user_call->type     = ZEND_INTERNAL_FUNCTION;

Zend/zend_variables.c

@@ -157,7 +157,7 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC)
 }
 
 
-ZEND_API int zend_print_variable(zval *var) 
+ZEND_API zend_size_t zend_print_variable(zval *var)
 {
 	return zend_print_zval(var, 0);
 }

Zend/zend_variables.h

@@ -47,7 +47,7 @@ static zend_always_inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC)
 
 ZEND_API int zval_copy_static_var(zval **p TSRMLS_DC, int num_args, va_list args, zend_hash_key *key);
 
-ZEND_API int zend_print_variable(zval *var);
+ZEND_API zend_size_t zend_print_variable(zval *var);
 ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC);
 ZEND_API void _zval_internal_dtor(zval *zvalue ZEND_FILE_LINE_DC);
 ZEND_API void _zval_internal_ptr_dtor(zval **zvalue ZEND_FILE_LINE_DC);