From b371e0d1fd0e0b7e74ecf55bdf6fa2ebd652edab Mon Sep 17 00:00:00 2001 From: Rui Hirokawa Date: Sat, 13 Aug 2011 13:17:36 +0000 Subject: [PATCH] fixed compile warning. --- ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h | 4 ++-- ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h index 4bef92de82..310ec7954b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h @@ -64,11 +64,11 @@ int mbfl_filt_conv_sjis_mobile_wchar(int c, mbfl_convert_filter *filter); 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); diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index b5c214882a..be0e6b080f 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -193,8 +193,7 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8_sb = { 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_utf8_mobile_wchar(int c, mbfl_convert_filter *filter) 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 && -- 2.50.1