hirokawa Sat, 13 Aug 2011 13:17:36 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314869
Log:
fixed compile warning.
Changed paths:
U php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h
U php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h
===================================================================
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h
2011-08-13 12:53:40 UTC (rev 314868)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h
2011-08-13 13:17:36 UTC (rev 314869)
@@ -64,11 +64,11 @@
int mbfl_filt_conv_wchar_sjis_mobile(int c, mbfl_convert_filter *filter);
int mbfl_filt_conv_sjis_mobile_flush(mbfl_convert_filter *filter);
-int mbfiler_sjis_emoji_docomo2unicode(int s, int *snd);
+int mbfilter_sjis_emoji_docomo2unicode(int s, int *snd);
int mbfilter_sjis_emoji_kddi2unicode(int s, int *snd);
int mbfilter_sjis_emoji_sb2unicode(int s, int *snd);
-int mbfiler_unicode2sjis_emoji_docomo(int c, int *s1, mbfl_convert_filter
*filter);
+int mbfilter_unicode2sjis_emoji_docomo(int c, int *s1, mbfl_convert_filter
*filter);
int mbfilter_unicode2sjis_emoji_kddi(int c, int *s1, mbfl_convert_filter
*filter);
int mbfilter_unicode2sjis_emoji_sb(int c, int *s1, mbfl_convert_filter
*filter);
Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
===================================================================
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
2011-08-13 12:53:40 UTC (rev 314868)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
2011-08-13 13:17:36 UTC (rev 314869)
@@ -193,8 +193,7 @@
int mbfl_filt_conv_utf8_mobile_wchar(int c, mbfl_convert_filter *filter)
{
int s, w = 0, flag = 0;
- int s1 = 0, s2 = 0, c1 = 0, c2 = 0, snd = 0;
- int sjis_encoded = 0;
+ int s1 = 0, c1 = 0, snd = 0;
if (c < 0x80) {
if (c >= 0) {
@@ -320,7 +319,7 @@
int mbfl_filt_conv_wchar_utf8_mobile(int c, mbfl_convert_filter *filter)
{
if (c >= 0 && c < 0x110000) {
- int s1, s2, c1, c2;
+ int s1, c1;
if ((filter->to->no_encoding == mbfl_no_encoding_utf8_docomo &&
mbfilter_unicode2sjis_emoji_docomo(c, &s1, filter) > 0
&&
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
