Moriyoshi Koizumi
moriy****@users*****
2002年 12月 17日 (火) 12:46:53 JST
moriyoshi 02/12/17 12:46:53
Modified: mbfl Tag: moriyoshi-20021217 Makefile.am filter.c
Removed: mbfl Tag: moriyoshi-20021217 codeset.c mbfl_codeset.h
Log:
Removed codeset support(?) since I don't see much need for this.
Revision Changes Path
No revision
No revision
1.1.1.1.2.1 +2 -2 libmbfl2/mbfl/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl2/mbfl/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Makefile.am 17 Dec 2002 03:01:41 -0000 1.1.1.1
+++ Makefile.am 17 Dec 2002 03:46:53 -0000 1.1.1.1.2.1
@@ -1,9 +1,9 @@
lib_LTLIBRARIES=libmbfl2.la
-libmbfl2_la_SOURCES=character.c codeset.c filter.c
+libmbfl2_la_SOURCES=character.c filter.c
libmbfl2_filters_la=../filters/libmbfl2_filters.la
libmbfl2_la_LIBADD=$(libmbfl2_filters_la)
libmbfl2_includedir=$(includedir)/mbfl2
-libmbfl2_include_HEADERS=mbfl.h mbfl_character.h mbfl_codeset.h mbfl_defs.h mbfl_enc.h mbfl_filter.h
+libmbfl2_include_HEADERS=mbfl.h mbfl_character.h mbfl_defs.h mbfl_enc.h mbfl_filter.h
$(libmbfl2_filters_la):
$(MAKE) -C `dirname $(libmbfl2_filters_la)`
1.1.1.1.2.1 +1 -9 libmbfl2/mbfl/filter.c
Index: filter.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl2/mbfl/filter.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- filter.c 17 Dec 2002 03:01:41 -0000 1.1.1.1
+++ filter.c 17 Dec 2002 03:46:53 -0000 1.1.1.1.2.1
@@ -31,7 +31,6 @@
#include <stddef.h>
#include "mbfl_filter.h"
-#include "mbfl_codeset.h"
/*
*
@@ -196,7 +195,6 @@
mbfl_filt_conv_illegal_output(int c, mbfl_convert_filter *filter)
{
int mode_backup, ret, n, m, r;
- mbfl_codeset *cs;
ret = 0;
mode_backup = filter->mode;
@@ -212,13 +210,7 @@
ret = filt_conv_strcat(filter, "U+");
} else {
if (c < MBFL_WCSGROUP_WCHARMAX) {
- cs = mbfl_codeset_get_by_plane(c & ~MBFL_WCSPLANE_MASK);
- if (cs != NULL) {
- ret = filt_conv_strcat(filter, cs->short_name);
- ret = filt_conv_strcat(filter, "+");
- } else {
- ret = filt_conv_strcat(filter, "?+");
- }
+ ret = filt_conv_strcat(filter, "?+");
c &= MBFL_WCSPLANE_MASK;
} else {
ret = filt_conv_strcat(filter, "BAD+");