PATCH intl 1.0.3 normalizer: intl_error_reset gets called twice

[email protected] (Hans-Peter Oeri) Sun, 20 Dec 2009 19:46:27 +0100
Newsgroups php.i18n
Message-ID <[email protected]>
Hi!

Going through intl/normalizer I found that intl_error_reset gets called
twice - once in a macro, once explicitely.

HPO
diff (text/plain, 906 B)
diff -r ddff919cd2c0 normalizer/normalizer_class.h
--- a/normalizer/normalizer_class.h	Sun Dec 20 16:12:59 2009 +0100
+++ b/normalizer/normalizer_class.h	Sun Dec 20 19:42:54 2009 +0100
@@ -44,9 +44,4 @@
 
 extern zend_class_entry *Normalizer_ce_ptr;
 
-/* Auxiliary macros */
-
-#define NORMALIZER_METHOD_INIT_VARS     \
-    intl_error_reset( NULL TSRMLS_CC ); \
-
 #endif // #ifndef NORMALIZER_CLASS_H
diff -r ddff919cd2c0 normalizer/normalizer_normalize.c
--- a/normalizer/normalizer_normalize.c	Sun Dec 20 16:12:59 2009 +0100
+++ b/normalizer/normalizer_normalize.c	Sun Dec 20 19:42:54 2009 +0100
@@ -49,8 +49,6 @@
 	int32_t			ret_len = 0;
 
 	int32_t			size_needed;
-		
-	NORMALIZER_METHOD_INIT_VARS
 
 	intl_error_reset( NULL TSRMLS_CC );
 
@@ -180,8 +178,6 @@
 	UErrorCode	status = U_ZERO_ERROR;
 		
 	UBool		uret = FALSE;
-		
-	NORMALIZER_METHOD_INIT_VARS
 
 	intl_error_reset( NULL TSRMLS_CC );