Moriyoshi Koizumi
moriy****@users*****
2002年 12月 21日 (土) 02:11:24 JST
moriyoshi 02/12/21 02:11:24
Modified: filters mbfilter_htmlent.c mbfilter_htmlent.h
mbfl mbfilter.c
Log:
Forgot those ones.
Revision Changes Path
1.2 +11 -0 libmbfl/filters/mbfilter_htmlent.c
Index: mbfilter_htmlent.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/filters/mbfilter_htmlent.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfilter_htmlent.c 7 Dec 2002 22:31:19 -0000 1.1
+++ mbfilter_htmlent.c 20 Dec 2002 17:11:24 -0000 1.2
@@ -62,6 +62,17 @@
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6
};
+static const char *mbfl_encoding_html_ent_aliases[] = {"HTML", "html", NULL};
+
+const mbfl_encoding mbfl_encoding_html_ent = {
+ mbfl_no_encoding_html_ent,
+ "HTML-ENTITIES",
+ "US-ASCII",
+ (const char *(*)[])&mbfl_encoding_html_ent_aliases,
+ NULL, /* mblen_table_html, Do not use table instead calulate length based on entities actually used */
+ MBFL_ENCTYPE_HTML_ENT
+};
+
#define CK(statement) do { if ((statement) < 0) return (-1); } while (0)
/*
1.2 +2 -0 libmbfl/filters/mbfilter_htmlent.h
Index: mbfilter_htmlent.h
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/filters/mbfilter_htmlent.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mbfilter_htmlent.h 7 Dec 2002 22:31:19 -0000 1.1
+++ mbfilter_htmlent.h 20 Dec 2002 17:11:24 -0000 1.2
@@ -32,6 +32,8 @@
#include "mbfilter.h"
+extern const mbfl_encoding mbfl_encoding_html_ent;
+
void mbfl_filt_conv_html_dec_ctor(mbfl_convert_filter *filter);
void mbfl_filt_conv_html_dec_dtor(mbfl_convert_filter *filter);
int mbfl_filt_conv_html_enc(int c, mbfl_convert_filter *filter);
1.6 +0 -11 libmbfl/mbfl/mbfilter.c
Index: mbfilter.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mbfilter.c 20 Dec 2002 16:46:36 -0000 1.5
+++ mbfilter.c 20 Dec 2002 17:11:24 -0000 1.6
@@ -211,17 +211,6 @@
MBFL_ENCTYPE_WCS4BE
};
-static const char *mbfl_encoding_html_ent_aliases[] = {"HTML", "html", NULL};
-
-static const mbfl_encoding mbfl_encoding_html_ent = {
- mbfl_no_encoding_html_ent,
- "HTML-ENTITIES",
- "US-ASCII",
- (const char *(*)[])&mbfl_encoding_html_ent_aliases,
- NULL, /* mblen_table_html, Do not use table instead calulate length based on entities actually used */
- MBFL_ENCTYPE_HTML_ENT
-};
-
static const mbfl_encoding mbfl_encoding_8bit = {
mbfl_no_encoding_8bit,
"8bit",