Moriyoshi Koizumi
moriy****@users*****
2004年 2月 4日 (水) 10:57:34 JST
moriyoshi 04/02/04 10:57:34
Modified: mbfl mbfl_convert.c mbfl_ident.c mbfl_ident.h
Log:
- Remove mbfl_ident_set_vtbl() / mbfl_convert_filter_set_vtbl(). Those methods
just didn't make sense in the first place.
Revision Changes Path
1.9 +5 -12 libmbfl/mbfl/mbfl_convert.c
Index: mbfl_convert.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_convert.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mbfl_convert.c 26 Jul 2003 11:21:17 -0000 1.8
+++ mbfl_convert.c 4 Feb 2004 01:57:33 -0000 1.9
@@ -422,17 +422,6 @@
return ret;
}
-void mbfl_convert_filter_set_vtbl(mbfl_convert_filter *filter, const mbfl_convert_vtbl *vtbl)
-{
- if (filter && vtbl) {
- filter->filter_ctor = vtbl->filter_ctor;
- filter->filter_dtor = vtbl->filter_dtor;
- filter->filter_function = vtbl->filter_function;
- filter->filter_flush = vtbl->filter_flush;
- }
-}
-
-
const mbfl_convert_vtbl * mbfl_convert_filter_get_vtbl(mbfl_encoding_id from, mbfl_encoding_id to)
{
const mbfl_convert_vtbl *vtbl;
@@ -467,7 +456,11 @@
if (vtbl == NULL) {
vtbl = &vtbl_pass;
}
- mbfl_convert_filter_set_vtbl(filter, vtbl);
+
+ filter->filter_ctor = vtbl->filter_ctor;
+ filter->filter_dtor = vtbl->filter_dtor;
+ filter->filter_function = vtbl->filter_function;
+ filter->filter_flush = vtbl->filter_flush;
}
/*
1.10 +6 -11 libmbfl/mbfl/mbfl_ident.c
Index: mbfl_ident.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_ident.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mbfl_ident.c 26 Jul 2003 11:21:17 -0000 1.9
+++ mbfl_ident.c 4 Feb 2004 01:57:33 -0000 1.10
@@ -49,25 +49,20 @@
/*
* identify filter
*/
-
-MBFLAPI void mbfl_identify_filter_set_vtbl(mbfl_identify_filter *filter, const mbfl_identify_vtbl *vtbl)
-{
- if (filter && vtbl) {
- filter->filter_ctor = vtbl->filter_ctor;
- filter->filter_dtor = vtbl->filter_dtor;
- filter->filter_function = vtbl->filter_function;
- }
-}
-
MBFLAPI void mbfl_identify_filter_select_vtbl(mbfl_identify_filter *filter)
{
const mbfl_identify_vtbl *vtbl;
+ assert(filter != NULL);
+
vtbl = filter->encoding->ident_vtbl;
if (vtbl == NULL) {
vtbl = &vtbl_identify_false;
}
- mbfl_identify_filter_set_vtbl(filter, vtbl);
+
+ filter->filter_ctor = vtbl->filter_ctor;
+ filter->filter_dtor = vtbl->filter_dtor;
+ filter->filter_function = vtbl->filter_function;
}
MBFLAPI mbfl_identify_filter *mbfl_identify_filter_new(mbfl_encoding *encoding)
1.7 +0 -1 libmbfl/mbfl/mbfl_ident.h
Index: mbfl_ident.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_ident.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mbfl_ident.h 25 Dec 2002 18:07:18 -0000 1.6
+++ mbfl_ident.h 4 Feb 2004 01:57:33 -0000 1.7
@@ -57,7 +57,6 @@
int (*filter_function)(int c, mbfl_identify_filter *filter);
};
-MBFLAPI void mbfl_identify_filter_set_vtbl(mbfl_identify_filter *filter, const mbfl_identify_vtbl *vtbl);
MBFLAPI void mbfl_identify_filter_select_vtbl(mbfl_identify_filter *filter);
MBFLAPI mbfl_identify_filter * mbfl_identify_filter_new(struct _mbfl_encoding *encoding);
MBFLAPI void mbfl_identify_filter_delete(mbfl_identify_filter *filter);