clean up normalizer code

diff --git a/ext/intl/normalizer/normalizer_class.h b/ext/intl/normalizer/normalizer_class.h
index 1d21b7a417e94b5ef90cc7f836263824f3e04a21..4d3f7d23415e7c86e35b5aaff5a5b74e8eac0c81 100755 (executable)
--- a/ext/intl/normalizer/normalizer_class.h
+++ b/ext/intl/normalizer/normalizer_class.h
@@ -39,14 +39,5 @@ typedef struct {
 #define NORMALIZER_ERROR_CODE_P(co) &(INTL_ERROR_CODE(NORMALIZER_ERROR(co)))
 
 void normalizer_register_Normalizer_class( TSRMLS_D );
-void normalizer_object_init( Normalizer_object* co TSRMLS_DC );
-void normalizer_object_destroy( Normalizer_object* co TSRMLS_DC );
-
 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 --git a/ext/intl/normalizer/normalizer_normalize.c b/ext/intl/normalizer/normalizer_normalize.c
index eb1451410ef3913c6e0c27b8b85a34f313c48907..edc8447269eae2413a5f69356a6f46904064ab57 100755 (executable)
--- a/ext/intl/normalizer/normalizer_normalize.c
+++ b/ext/intl/normalizer/normalizer_normalize.c
@@ -50,8 +50,6 @@ PHP_FUNCTION( normalizer_normalize )
 
        int32_t                 size_needed;
                
-       NORMALIZER_METHOD_INIT_VARS
-
        intl_error_reset( NULL TSRMLS_CC );
 
        /* Parse parameters. */
@@ -181,8 +179,6 @@ PHP_FUNCTION( normalizer_is_normalized )
                
        UBool           uret = FALSE;
                
-       NORMALIZER_METHOD_INIT_VARS
-
        intl_error_reset( NULL TSRMLS_CC );
 
        /* Parse parameters. */