Moriyoshi Koizumi
moriy****@users*****
2002年 12月 31日 (火) 01:39:25 JST
moriyoshi 02/12/31 01:39:25
Modified: mbfl mbfilter.c
Log:
Reflect the recent API change
Revision Changes Path
1.18 +10 -9 libmbfl/mbfl/mbfilter.c
Index: mbfilter.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfilter.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mbfilter.c 26 Dec 2002 23:39:40 -0000 1.17
+++ mbfilter.c 30 Dec 2002 16:39:25 -0000 1.18
@@ -104,6 +104,7 @@
#include "mbfilter.h"
#include "mbfl_string.h"
#include "mbfl_filter_output.h"
+#include "mbfl_memory_device.h"
#include "mbfilter_pass.h"
/* hex character table "0123456789ABCDEF" */
@@ -473,7 +474,7 @@
for (;;) {
pc->found_pos++;
p = h;
- m = pc->needle.buffer;
+ m = (int *)pc->needle.buffer;
n = pc->needle_pos - 1;
while (n > 0 && *p == *m) {
n--;
@@ -508,7 +509,7 @@
return -8;
}
/* needle is converted into wchar */
- mbfl_wchar_device_init(&pc.needle);
+ mbfl_wchar_device_ctor(&pc.needle);
filter = mbfl_convert_filter_new(
needle->no_encoding,
mbfl_encoding_id_wchar,
@@ -533,7 +534,7 @@
return -4;
}
if (pc.needle_len <= 0) {
- mbfl_wchar_device_clear(&pc.needle);
+ mbfl_wchar_device_dtor(&pc.needle);
return -2;
}
/* initialize filter and collector data */
@@ -542,7 +543,7 @@
mbfl_encoding_id_wchar,
collector_strpos, 0, &pc);
if (filter == NULL) {
- mbfl_wchar_device_clear(&pc.needle);
+ mbfl_wchar_device_dtor(&pc.needle);
return -4;
}
pc.start = offset;
@@ -569,7 +570,7 @@
mbfl_convert_filter_flush(filter);
result = pc.matched_pos;
mbfl_convert_filter_delete(filter);
- mbfl_wchar_device_clear(&pc.needle);
+ mbfl_wchar_device_dtor(&pc.needle);
return result;
}
@@ -589,7 +590,7 @@
return -8;
}
/* needle is converted into wchar */
- mbfl_wchar_device_init(&pc.needle);
+ mbfl_wchar_device_ctor(&pc.needle);
filter = mbfl_convert_filter_new(
needle->no_encoding,
mbfl_encoding_id_wchar,
@@ -614,7 +615,7 @@
return -4;
}
if (pc.needle_len <= 0) {
- mbfl_wchar_device_clear(&pc.needle);
+ mbfl_wchar_device_dtor(&pc.needle);
return -2;
}
/* initialize filter and collector data */
@@ -623,7 +624,7 @@
mbfl_encoding_id_wchar,
collector_strpos, 0, &pc);
if (filter == NULL) {
- mbfl_wchar_device_clear(&pc.needle);
+ mbfl_wchar_device_dtor(&pc.needle);
return -4;
}
pc.start = 0;
@@ -650,7 +651,7 @@
}
mbfl_convert_filter_flush(filter);
mbfl_convert_filter_delete(filter);
- mbfl_wchar_device_clear(&pc.needle);
+ mbfl_wchar_device_dtor(&pc.needle);
return result;
}