stas                                     Mon, 21 Dec 2009 20:12:46 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=292434

Log:
clean up normalizer code

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_class.h
    U   php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_normalize.c
    U   php/php-src/trunk/ext/intl/normalizer/normalizer_class.h
    U   php/php-src/trunk/ext/intl/normalizer/normalizer_normalize.c

Modified: php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_class.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_class.h 
2009-12-21 19:54:13 UTC (rev 292433)
+++ php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_class.h 
2009-12-21 20:12:46 UTC (rev 292434)
@@ -39,14 +39,5 @@
 #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

Modified: 
php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_normalize.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_normalize.c     
2009-12-21 19:54:13 UTC (rev 292433)
+++ php/php-src/branches/PHP_5_3/ext/intl/normalizer/normalizer_normalize.c     
2009-12-21 20:12:46 UTC (rev 292434)
@@ -50,8 +50,6 @@

        int32_t                 size_needed;

-       NORMALIZER_METHOD_INIT_VARS
-
        intl_error_reset( NULL TSRMLS_CC );

        /* Parse parameters. */
@@ -181,8 +179,6 @@

        UBool           uret = FALSE;

-       NORMALIZER_METHOD_INIT_VARS
-
        intl_error_reset( NULL TSRMLS_CC );

        /* Parse parameters. */

Modified: php/php-src/trunk/ext/intl/normalizer/normalizer_class.h
===================================================================
--- php/php-src/trunk/ext/intl/normalizer/normalizer_class.h    2009-12-21 
19:54:13 UTC (rev 292433)
+++ php/php-src/trunk/ext/intl/normalizer/normalizer_class.h    2009-12-21 
20:12:46 UTC (rev 292434)
@@ -39,14 +39,5 @@
 #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

Modified: php/php-src/trunk/ext/intl/normalizer/normalizer_normalize.c
===================================================================
--- php/php-src/trunk/ext/intl/normalizer/normalizer_normalize.c        
2009-12-21 19:54:13 UTC (rev 292433)
+++ php/php-src/trunk/ext/intl/normalizer/normalizer_normalize.c        
2009-12-21 20:12:46 UTC (rev 292434)
@@ -45,8 +45,6 @@

        int32_t                 size_needed;

-       NORMALIZER_METHOD_INIT_VARS
-
        intl_error_reset( NULL TSRMLS_CC );

        /* Parse parameters. */
@@ -144,8 +142,6 @@

        UBool           uret = FALSE;

-       NORMALIZER_METHOD_INIT_VARS
-
        intl_error_reset( NULL TSRMLS_CC );

        /* Parse parameters. */

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to