Merge pull request #1 from weltling/string_size_refactor_take_2

windows fixes

Author: ircmaxell

ext/spl/php_spl.c

@@ -415,7 +415,7 @@ PHP_FUNCTION(spl_autoload_call)
 	zval *class_name, *retval = NULL;
 	int class_name_len;
 	char *func_name, *lc_name;
-	uint func_name_len;
+	zend_str_size_uint func_name_len;
 	ulong dummy;
 	HashPosition function_pos;
 	autoload_func_info *alfi;
@@ -466,7 +466,7 @@ PHP_FUNCTION(spl_autoload_call)
 PHP_FUNCTION(spl_autoload_register)
 {
 	char *func_name, *error = NULL;
-	int  func_name_len;
+	zend_str_size_int func_name_len;
 	char *lc_name = NULL;
 	zval *zcallable = NULL;
 	zend_bool do_throw = 1;
@@ -627,7 +627,7 @@ PHP_FUNCTION(spl_autoload_register)
 PHP_FUNCTION(spl_autoload_unregister)
 {
 	char *func_name, *error = NULL;
-	int func_name_len;
+	zend_str_size_int func_name_len;
 	char *lc_name = NULL;
 	zval *zcallable;
 	int success = FAILURE;

ext/spl/spl_directory.c

@@ -183,7 +183,7 @@ static zend_object_value spl_filesystem_object_new_check(zend_class_entry *class
 /* }}} */
 
 
-PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, int *len TSRMLS_DC) /* {{{ */
+PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, zend_str_size_int *len TSRMLS_DC) /* {{{ */
 {
 #ifdef HAVE_GLOB
 	if (intern->type == SPL_FS_DIR) {
@@ -589,7 +589,7 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
 	HashTable *rv;
 	zval *tmp, zrv;
 	char *pnstr, *path;
-	int  pnlen, path_len;
+	zend_str_size_int  pnlen, path_len;
 	char stmp[2];
 
 	*is_temp = 1;

ext/spl/spl_dllist.c

@@ -511,7 +511,7 @@ static HashTable* spl_dllist_object_get_debug_info(zval *obj, int *is_temp TSRML
 	spl_ptr_llist_element *current = intern->llist->head, *next;
 	zval *tmp, zrv, *dllist_array;
 	char *pnstr;
-	int  pnlen;
+	zend_str_size_int pnlen;
 	int  i = 0;
 
 	*is_temp = 0;

ext/spl/spl_functions.c

@@ -133,7 +133,7 @@ int spl_add_classes(zend_class_entry *pce, zval *list, int sub, int allow, int c
 }
 /* }}} */
 
-char * spl_gen_private_prop_name(zend_class_entry *ce, char *prop_name, int prop_len, int *name_len TSRMLS_DC) /* {{{ */
+char * spl_gen_private_prop_name(zend_class_entry *ce, char *prop_name, zend_str_size_int prop_len, zend_str_size_int *name_len TSRMLS_DC) /* {{{ */
 {
 	char *rv;
 

ext/spl/spl_heap.c

@@ -523,7 +523,7 @@ static HashTable* spl_heap_object_get_debug_info_helper(zend_class_entry *ce, zv
 	spl_heap_object *intern  = (spl_heap_object*)zend_object_store_get_object(obj TSRMLS_CC);
 	zval *tmp, zrv, *heap_array;
 	char *pnstr;
-	int  pnlen;
+	zend_str_size_int pnlen;
 	int  i;
 
 	*is_temp = 0;

ext/spl/spl_observer.c

@@ -318,7 +318,7 @@ static HashTable* spl_object_storage_debug_info(zval *obj, int *is_temp TSRMLS_D
 	HashPosition pos;
 	zval *tmp, *storage;
 	char md5str[33];
-	int name_len;
+	zend_str_size_int name_len;
 	char *zname;
 
 	*is_temp = 0;

ext/standard/http.c

@@ -34,7 +34,7 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
 	char *key = NULL;
 	char *ekey, *newprefix, *p;
 	int arg_sep_len, ekey_len, key_type, newprefix_len;
-	uint key_len;
+	zend_str_size_uint key_len;
 	ulong idx;
 	zval **zdata = NULL, *copyzval;
 

ext/standard/info.c

@@ -102,7 +102,7 @@ static int php_info_print(const char *str) /* {{{ */
 static void php_info_print_stream_hash(const char *name, HashTable *ht TSRMLS_DC) /* {{{ */
 {
 	char *key;
-	uint len;
+	zend_str_size_uint len;
 
 	if (ht) {
 		if (zend_hash_num_elements(ht)) {
@@ -196,7 +196,7 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC)
 {
 	zval **data, **tmp, tmp2;
 	char *string_key;
-	uint string_len;
+	zend_str_size_uint string_len;
 	ulong num_key;
 
 	zend_is_auto_global(name, name_length TSRMLS_CC);

ext/standard/string.c

@@ -1413,7 +1413,7 @@ PHP_FUNCTION(strtolower)
 PHPAPI void php_basename(const char *s, zend_str_size_size_t len, char *suffix, zend_str_size_size_t sufflen, char **p_ret, zend_str_size_size_t *p_len TSRMLS_DC)
 {
 	char *ret = NULL, *c, *comp, *cend;
-	zend_str_size inc_len, cnt;
+	zend_str_size_size_t inc_len, cnt;
 	int state;
 
 	c = comp = cend = (char*)s;

win32/build/config.w32

@@ -449,3 +449,9 @@ if (PHP_STATIC_ANALYZE == "yes") {
 	ADD_FLAG("CFLAGS", " /analyze ");
 	ADD_FLAG("CFLAGS", " /wd6308 ");
 }
+
+ARG_ENABLE("zstrlen", "Include Z_STRLEN macros enabling size_t for string length", "no");
+if (PHP_ZSTRLEN == "yes") {
+	AC_DEFINE('ZEND_USE_LEGACY_STRING_TYPES', 1, "");
+}
+

win32/registry.c

@@ -90,7 +90,7 @@ static int LoadDirectory(HashTable *directories, HKEY key, char *path, int path_
 						}
 						INIT_PZVAL(data);
 						Z_STRVAL_P(data) = zend_strndup(value, value_len-1);
-						Z_STRLEN_P(data) = value_len-1;
+						Z_STRSIZE_P(data) = value_len-1;
 						Z_TYPE_P(data) = IS_STRING;
 						zend_hash_update(ht, name, name_len+1, &data, sizeof(zval*), NULL);
 					}
@@ -261,7 +261,7 @@ void UpdateIniFromRegistry(char *path TSRMLS_DC)
 			     zend_hash_get_current_data_ex(ht, (void**)&data, &pos) == SUCCESS &&
 			     zend_hash_get_current_key_ex(ht, &index, &index_len, &num, 0, &pos) == HASH_KEY_IS_STRING;
 			     zend_hash_move_forward_ex(ht, &pos)) {
-				zend_alter_ini_entry(index, index_len, Z_STRVAL_PP(data), Z_STRLEN_PP(data), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
+				zend_alter_ini_entry(index, index_len, Z_STRVAL_PP(data), Z_STRSIZE_PP(data), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
 			}
 			break;
 		}