[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl intl_data.h intl_error.c

[Stanislav Malyshev]

stas            Sun May 10 19:10:37 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/intl   intl_data.h intl_error.c 
  Log:
  little errors cleanup
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_data.h?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/intl/intl_data.h
diff -u php-src/ext/intl/intl_data.h:1.1.2.4 
php-src/ext/intl/intl_data.h:1.1.2.5
--- php-src/ext/intl/intl_data.h:1.1.2.4        Thu Jan 29 21:49:49 2009
+++ php-src/ext/intl/intl_data.h        Sun May 10 19:10:36 2009
@@ -50,7 +50,7 @@
     intl_error_set_code( NULL, (err) TSRMLS_CC );                              
                        \
     if( U_FAILURE((err)) )                                                     
                                                \
     {                                                                          
                                                                \
-        intl_errors_set_custom_msg( NULL, msg, 0 TSRMLS_CC );                  
        \
+        intl_error_set_custom_msg( NULL, msg, 0 TSRMLS_CC );                   
        \
         RETURN_FALSE;                                                          
                                                \
     }
 
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_error.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/intl/intl_error.c
diff -u php-src/ext/intl/intl_error.c:1.1.2.2 
php-src/ext/intl/intl_error.c:1.1.2.3
--- php-src/ext/intl/intl_error.c:1.1.2.2       Mon Aug 11 19:47:59 2008
+++ php-src/ext/intl/intl_error.c       Sun May 10 19:10:36 2009
@@ -173,7 +173,9 @@
  */
 void intl_error_set( intl_error* err, UErrorCode code, char* msg, int copyMsg 
TSRMLS_DC )
 {
-       intl_error_set_code( err, code TSRMLS_CC );
+       if(err) {
+               intl_error_set_code( err, code TSRMLS_CC );
+       }
        intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
 }
 /* }}} */
@@ -182,7 +184,9 @@
  */
 void intl_errors_reset( intl_error* err TSRMLS_DC )
 {
-       intl_error_reset( err TSRMLS_CC );
+       if(err) {
+               intl_error_reset( err TSRMLS_CC );
+       }
        intl_error_reset( NULL TSRMLS_CC );
 }
 /* }}} */
@@ -191,7 +195,9 @@
  */
 void intl_errors_set_custom_msg( intl_error* err, char* msg, int copyMsg 
TSRMLS_DC )
 {
-       intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
+       if(err) {
+               intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
+       }
        intl_error_set_custom_msg( NULL, msg, copyMsg TSRMLS_CC );
 }
 /* }}} */
@@ -200,7 +206,9 @@
  */
 void intl_errors_set_code( intl_error* err, UErrorCode err_code TSRMLS_DC )
 {
-       intl_error_set_code( err, err_code TSRMLS_CC );
+       if(err) {
+               intl_error_set_code( err, err_code TSRMLS_CC );
+       }
        intl_error_set_code( NULL, err_code TSRMLS_CC );
 }
 /* }}} */



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