Cleanup (1-st round)

8 files changed, 26 insertions, 20 deletions

diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp
index b6b47348f0..181d0e03b9 100644
--- a/ext/intl/breakiterator/breakiterator_class.cpp
+++ b/ext/intl/breakiterator/breakiterator_class.cpp
@@ -165,7 +165,7 @@ static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp TSRMLS
 	}
 
 	add_assoc_string_ex(&zv, "type", sizeof("type"),
-			const_cast<char*>(typeid(*biter).name()), 1);
+			const_cast<char*>(typeid(*biter).name()));
 
 	return Z_ARRVAL(zv);
 }
diff --git a/ext/intl/calendar/calendar_class.cpp b/ext/intl/calendar/calendar_class.cpp
index 497279e090..99828c43ea 100644
--- a/ext/intl/calendar/calendar_class.cpp
+++ b/ext/intl/calendar/calendar_class.cpp
@@ -168,7 +168,7 @@ static HashTable *Calendar_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
 	add_assoc_bool_ex(&zv, "valid", sizeof("valid"), 1);
 
 	add_assoc_string_ex(&zv, "type", sizeof("type"),
-		const_cast<char*>(cal->getType()), 1);
+		const_cast<char*>(cal->getType()));
 
 	{
 		zval		   ztz = zval_used_for_init,
@@ -191,10 +191,10 @@ static HashTable *Calendar_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
 		Locale		locale	= cal->getLocale(ULOC_VALID_LOCALE, uec);
 		if (U_SUCCESS(uec)) {
 			add_assoc_string_ex(&zv, "locale", sizeof("locale"),
-				const_cast<char*>(locale.getName()), 1);
+				const_cast<char*>(locale.getName()));
 		} else {
 			add_assoc_string_ex(&zv, "locale", sizeof("locale"),
-				const_cast<char*>(u_errorName(uec)), 1);
+				const_cast<char*>(u_errorName(uec)));
 		}
 	}
 
@@ -210,7 +210,7 @@ static HashTable *Calendar_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
 		if (U_SUCCESS(uec)) {
 			add_assoc_long(zfields, name, (long)res);
 		} else {
-			add_assoc_string(zfields, name, const_cast<char*>(u_errorName(uec)), 1);
+			add_assoc_string(zfields, name, const_cast<char*>(u_errorName(uec)));
 		}
 	}
 
diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp
index ae7d0093f7..179602d8fa 100644
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -210,7 +210,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_available_locales)
 	array_init(return_value);
 	for (int i = 0; i < count; i++) {
 		Locale locale = availLocales[i];
-		add_next_index_string(return_value, locale.getName(), 1);
+		add_next_index_string(return_value, locale.getName());
 	}
 }
 
diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
index 5f2d1e7fa7..cddcf82418 100644
--- a/ext/intl/converter/converter.c
+++ b/ext/intl/converter/converter.c
@@ -549,7 +549,7 @@ static void php_converter_resolve_callback(zval *zobj,
 	array_init(&caller);
 	Z_ADDREF_P(zobj);
 	add_index_zval(&caller, 0, zobj);
-	add_index_string(&caller, 1, callback_name, 1);
+	add_index_string(&caller, 1, callback_name);
 	if (zend_fcall_info_init(&caller, 0, finfo, fcache, NULL, &errstr TSRMLS_CC) == FAILURE) {
 		php_converter_throw_failure(objval, U_INTERNAL_PROGRAM_ERROR TSRMLS_CC, "Error setting converter callback: %s", errstr);
 	}
@@ -913,7 +913,7 @@ static PHP_METHOD(UConverter, getAvailable) {
 	array_init(return_value);
 	for(i = 0; i < count; i++) {
 		const char *name = ucnv_getAvailableName(i);
-		add_next_index_string(return_value, name, 1);
+		add_next_index_string(return_value, name);
 	}
 }
 /* }}} */
@@ -952,7 +952,7 @@ static PHP_METHOD(UConverter, getAliases) {
 			zval_dtor(return_value);
 			RETURN_NULL();
 		}
-		add_next_index_string(return_value, alias, 1);
+		add_next_index_string(return_value, alias);
 	}
 }
 /* }}} */
@@ -980,7 +980,7 @@ static PHP_METHOD(UConverter, getStandards) {
 			zval_dtor(return_value);
 			RETURN_NULL();
 		}
-		add_next_index_string(return_value, name, 1);
+		add_next_index_string(return_value, name);
 	}
 }
 /* }}} */
diff --git a/ext/intl/locale/locale_methods.c b/ext/intl/locale/locale_methods.c
index 21b5847f2d..f5be81f74a 100644
--- a/ext/intl/locale/locale_methods.c
+++ b/ext/intl/locale/locale_methods.c
@@ -724,7 +724,9 @@ PHP_FUNCTION( locale_get_keywords )
         		RETURN_FALSE;
 			}
 
-       		add_assoc_stringl( return_value, (char *)kw_key, kw_value , kw_value_len, 0);
+			// TODO: avoid reallocation ???
+       		add_assoc_stringl( return_value, (char *)kw_key, kw_value , kw_value_len);
+       		efree(kw_value);
 		} /* end of while */
 
 	} /* end of if e!=NULL */
@@ -1047,11 +1049,11 @@ static int add_array_entry(const char* loc_name, zval* hash_arr, char* key_name
 			}
 			cur_key_name = (char*)ecalloc( 25,  25);
 			sprintf( cur_key_name , "%s%d", key_name , cnt++);	
-			add_assoc_string( hash_arr, cur_key_name , token ,TRUE );
+			add_assoc_string( hash_arr, cur_key_name , token);
 			/* tokenize on the "_" or "-" and stop  at singleton if any */
 			while( (token = php_strtok_r(NULL , DELIMITER , &last_ptr)) && (strlen(token)>1) ){
 				sprintf( cur_key_name , "%s%d", key_name , cnt++);	
-				add_assoc_string( hash_arr, cur_key_name , token , TRUE );
+				add_assoc_string( hash_arr, cur_key_name , token);
 			}
 /*
 			if( strcmp(key_name, LOC_PRIVATE_TAG) == 0 ){
@@ -1060,7 +1062,7 @@ static int add_array_entry(const char* loc_name, zval* hash_arr, char* key_name
 		}
 	} else {
 		if( result == 1 ){
-			add_assoc_string( hash_arr, key_name , key_value , TRUE );
+			add_assoc_string( hash_arr, key_name , key_value);
 			cur_result = 1;
 		}
 	}
@@ -1107,7 +1109,7 @@ PHP_FUNCTION(locale_parse)
 
 	grOffset =  findOffset( LOC_GRANDFATHERED , loc_name );
 	if( grOffset >= 0 ){
-		add_assoc_string( return_value , LOC_GRANDFATHERED_LANG_TAG , estrdup(loc_name) ,FALSE );
+		add_assoc_string( return_value , LOC_GRANDFATHERED_LANG_TAG , loc_name);
 	}
 	else{
 		/* Not grandfathered */
@@ -1164,10 +1166,10 @@ PHP_FUNCTION(locale_get_all_variants)
 		if( result > 0 && variant){
 			/* Tokenize on the "_" or "-" */
 			token = php_strtok_r( variant , DELIMITER , &saved_ptr);	
-			add_next_index_stringl( return_value, token , strlen(token) ,TRUE );
+			add_next_index_stringl( return_value, token , strlen(token));
 			/* tokenize on the "_" or "-" and stop  at singleton if any	*/
 			while( (token = php_strtok_r(NULL , DELIMITER, &saved_ptr)) && (strlen(token)>1) ){
- 				add_next_index_stringl( return_value, token , strlen(token) ,TRUE );
+ 				add_next_index_stringl( return_value, token , strlen(token));
 			}
 		}
 		if( variant ){
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
index dc1212431a..ca1828cd37 100644
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -340,7 +340,7 @@ PHP_FUNCTION( resourcebundle_locales )
 
 	array_init( return_value );
 	while ((entry = uenum_next( icuenum, &entry_len, &icuerror ))) {
-		add_next_index_stringl( return_value, (char *) entry, entry_len, 1 );
+		add_next_index_stringl( return_value, (char *) entry, entry_len);
 	}
 	uenum_close( icuenum );
 }
diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp
index 374b163851..fa08af8503 100644
--- a/ext/intl/timezone/timezone_class.cpp
+++ b/ext/intl/timezone/timezone_class.cpp
@@ -311,7 +311,9 @@ static HashTable *TimeZone_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
 	if (U_FAILURE(uec)) {
 		return Z_ARRVAL(zv);
 	}
-	add_assoc_stringl_ex(&zv, "id", sizeof("id"), str, str_len, 0);
+	// TODO: avoid reallocation ???
+	add_assoc_stringl_ex(&zv, "id", sizeof("id"), str, str_len);
+	efree(str);
 
 	int32_t rawOffset, dstOffset;
 	UDate now = Calendar::getNow();
diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c
index 1aa39c54b9..4b77508ff0 100644
--- a/ext/intl/transliterator/transliterator_methods.c
+++ b/ext/intl/transliterator/transliterator_methods.c
@@ -277,7 +277,9 @@ PHP_FUNCTION( transliterator_list_ids )
 		}
 		else
 		{
-			add_next_index_stringl( return_value, el_char, el_len, 0 );
+		    // TODO: avoid reallocation ???
+			add_next_index_stringl( return_value, el_char, el_len);
+			efree(el_char);
 		}
 	}
 	uenum_close( en );