felipe Wed, 12 Jan 2011 00:29:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307392
Log:
- Fixed compiler warnings
Changed paths:
U php/php-src/branches/PHP_5_3/ext/intl/locale/locale_methods.c
U php/php-src/trunk/ext/intl/locale/locale_methods.c
U php/php-src/trunk/ext/intl/transliterator/transliterator_methods.c
Modified: php/php-src/branches/PHP_5_3/ext/intl/locale/locale_methods.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/intl/locale/locale_methods.c
2011-01-11 23:35:13 UTC (rev 307391)
+++ php/php-src/branches/PHP_5_3/ext/intl/locale/locale_methods.c
2011-01-12 00:29:59 UTC (rev 307392)
@@ -264,7 +264,7 @@
UErrorCode status = U_ZERO_ERROR;
- if( tag_name != LOC_CANONICALIZE_TAG ){
+ if( strcmp(tag_name, LOC_CANONICALIZE_TAG) != 0 ){
/* Handle grandfathered languages */
grOffset = findOffset( LOC_GRANDFATHERED , loc_name );
if( grOffset >= 0 ){
@@ -501,7 +501,7 @@
loc_name = INTL_G(default_locale);
}
- if( tag_name != DISP_NAME ){
+ if( strcmp(tag_name, DISP_NAME) != 0 ){
/* Handle grandfathered languages */
grOffset = findOffset( LOC_GRANDFATHERED , loc_name );
if( grOffset >= 0 ){
@@ -1042,9 +1042,10 @@
sprintf( cur_key_name , "%s%d", key_name ,
cnt++);
add_assoc_string( hash_arr, cur_key_name ,
token , TRUE );
}
-
- if( key_name == LOC_PRIVATE_TAG ){
+/*
+ if( strcmp(key_name, LOC_PRIVATE_TAG) == 0 ){
}
+*/
}
} else {
if( result == 1 ){
Modified: php/php-src/trunk/ext/intl/locale/locale_methods.c
===================================================================
--- php/php-src/trunk/ext/intl/locale/locale_methods.c 2011-01-11 23:35:13 UTC
(rev 307391)
+++ php/php-src/trunk/ext/intl/locale/locale_methods.c 2011-01-12 00:29:59 UTC
(rev 307392)
@@ -264,7 +264,7 @@
UErrorCode status = U_ZERO_ERROR;
- if( tag_name != LOC_CANONICALIZE_TAG ){
+ if( strcmp(tag_name, LOC_CANONICALIZE_TAG) != 0 ){
/* Handle grandfathered languages */
grOffset = findOffset( LOC_GRANDFATHERED , loc_name );
if( grOffset >= 0 ){
@@ -501,7 +501,7 @@
loc_name = INTL_G(default_locale);
}
- if( tag_name != DISP_NAME ){
+ if( strcmp(tag_name, DISP_NAME) != 0 ){
/* Handle grandfathered languages */
grOffset = findOffset( LOC_GRANDFATHERED , loc_name );
if( grOffset >= 0 ){
@@ -1042,9 +1042,10 @@
sprintf( cur_key_name , "%s%d", key_name ,
cnt++);
add_assoc_string( hash_arr, cur_key_name ,
token , TRUE );
}
-
- if( key_name == LOC_PRIVATE_TAG ){
+/*
+ if( strcmp(key_name, LOC_PRIVATE_TAG) == 0 ){
}
+*/
}
} else {
if( result == 1 ){
Modified: php/php-src/trunk/ext/intl/transliterator/transliterator_methods.c
===================================================================
--- php/php-src/trunk/ext/intl/transliterator/transliterator_methods.c
2011-01-11 23:35:13 UTC (rev 307391)
+++ php/php-src/trunk/ext/intl/transliterator/transliterator_methods.c
2011-01-12 00:29:59 UTC (rev 307392)
@@ -259,7 +259,7 @@
"transliterator_list_ids: Failed to obtain registered
transliterators" );
array_init( return_value );
- while( elem = uenum_unext( en, &elem_len, &status ) )
+ while( (elem = uenum_unext( en, &elem_len, &status )) )
{
char *el_char = NULL;
int el_len = 0;
@@ -365,7 +365,7 @@
RETURN_FALSE;
}
- if( start < 0 || (limit != -1 ) && (start > limit ) )
+ if( start < 0 || ((limit != -1 ) && (start > limit )) )
{
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
"transliterator_transliterate: \"start\" argument
should be "
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
