add is_initialized member into OnigEncodingType

diff --git a/src/ascii.c b/src/ascii.c
index af442e6ca9dbed1cbc1b6638c8d20c9d6c9db615..92db179baf0fef573dc47e01378eb927b1b3d3ff 100644 (file)
--- a/src/ascii.c
+++ b/src/ascii.c
@@ -55,5 +55,6 @@ OnigEncodingType OnigEncodingASCII = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/big5.c b/src/big5.c
index 88e95fe150b954c1e5e0175597b8475466cca17e..3c90eaa46d700b2281deac434efa54f3f5f40974 100644 (file)
--- a/src/big5.c
+++ b/src/big5.c
@@ -159,5 +159,6 @@ OnigEncodingType OnigEncodingBIG5 = {
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
   big5_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/cp1251.c b/src/cp1251.c
index 8b8bec34afd3f052617492f68cb3b5e61f31b920..af458473b74bdf812239671649ea203e6bf135b7 100644 (file)
--- a/src/cp1251.c
+++ b/src/cp1251.c
@@ -197,5 +197,6 @@ OnigEncodingType OnigEncodingCP1251 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/euc_jp.c b/src/euc_jp.c
index f0a09d9f3bb6d4c179c4a763720ef77616ba0156..17f53e7458fadac8377ea94199947d6f298501c9 100644 (file)
--- a/src/euc_jp.c
+++ b/src/euc_jp.c
@@ -268,5 +268,6 @@ OnigEncodingType OnigEncodingEUC_JP = {
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/euc_kr.c b/src/euc_kr.c
index 1475b60a94c8fc9a870b988f9f735c85ccc7dfa9..769104b7603517ac1e6d7ec2c6a0618ca0a00ac6 100644 (file)
--- a/src/euc_kr.c
+++ b/src/euc_kr.c
@@ -134,7 +134,9 @@ OnigEncodingType OnigEncodingEUC_KR = {
   euckr_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   euckr_left_adjust_char_head,
-  euckr_is_allowed_reverse_match
+  euckr_is_allowed_reverse_match,
+  NULL, /* init */
+  NULL  /* is_initialized */
 };
 
 /* Same with OnigEncodingEUC_KR except the name */
@@ -155,5 +157,6 @@ OnigEncodingType OnigEncodingEUC_CN = {
   onigenc_not_support_get_ctype_code_range,
   euckr_left_adjust_char_head,
   euckr_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/euc_tw.c b/src/euc_tw.c
index f7cfeb7226562e185bcfba6240c4fdc13fdabf93..f75796151d0b1e1a802b76561204686b45bf1674 100644 (file)
--- a/src/euc_tw.c
+++ b/src/euc_tw.c
@@ -126,5 +126,6 @@ OnigEncodingType OnigEncodingEUC_TW = {
   onigenc_not_support_get_ctype_code_range,
   euctw_left_adjust_char_head,
   euctw_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/gb18030.c b/src/gb18030.c
index a8cc0ca317ae996dcbe031caa9228064ff74097c..beeda06a34d133a8bed6280f2764ac61e9bdc4d8 100644 (file)
--- a/src/gb18030.c
+++ b/src/gb18030.c
@@ -492,5 +492,6 @@ OnigEncodingType OnigEncodingGB18030 = {
   onigenc_not_support_get_ctype_code_range,
   gb18030_left_adjust_char_head,
   gb18030_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_1.c b/src/iso8859_1.c
index 158a2c645210494ae82719e74559a296db309f76..b2d8c9ac5617b3d1e50924ba93fe1396796adbb0 100644 (file)
--- a/src/iso8859_1.c
+++ b/src/iso8859_1.c
@@ -269,5 +269,6 @@ OnigEncodingType OnigEncodingISO_8859_1 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_10.c b/src/iso8859_10.c
index abce99cc4fabce9c353dbbe6c1df34c10ee192d4..a6dbe5c3cd37d0b4d799b78fd3080cb9a2ed563f 100644 (file)
--- a/src/iso8859_10.c
+++ b/src/iso8859_10.c
@@ -236,5 +236,6 @@ OnigEncodingType OnigEncodingISO_8859_10 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_11.c b/src/iso8859_11.c
index 66408724b8ff8dc2fe6941f5d75f0e99e79f8dc3..d671af8b1c93cae7d261cf4716ceac291369e22a 100644 (file)
--- a/src/iso8859_11.c
+++ b/src/iso8859_11.c
@@ -93,5 +93,6 @@ OnigEncodingType OnigEncodingISO_8859_11 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_13.c b/src/iso8859_13.c
index 62e1092ab2de04741bf6a29d9d856877b6d5f505..c97e24e7f97d1193854e9f322bb293b8b6e924cb 100644 (file)
--- a/src/iso8859_13.c
+++ b/src/iso8859_13.c
@@ -225,5 +225,6 @@ OnigEncodingType OnigEncodingISO_8859_13 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_14.c b/src/iso8859_14.c
index 4cb35a665ae070fe5824c6febda99a4760fb3461..edf5313108f213475159d4938dc77578f7cf39c6 100644 (file)
--- a/src/iso8859_14.c
+++ b/src/iso8859_14.c
@@ -238,5 +238,6 @@ OnigEncodingType OnigEncodingISO_8859_14 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_15.c b/src/iso8859_15.c
index d94a8c398d6bb8260275747d62e14acc97e81810..24aa5730b28c2fac852d5d7fa5f009c89c5f0c82 100644 (file)
--- a/src/iso8859_15.c
+++ b/src/iso8859_15.c
@@ -232,5 +232,6 @@ OnigEncodingType OnigEncodingISO_8859_15 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_16.c b/src/iso8859_16.c
index ec19df1d3d134834f1660eb73db5db680462d178..4f4c2b83089f28111069c16770418c624760931f 100644 (file)
--- a/src/iso8859_16.c
+++ b/src/iso8859_16.c
@@ -234,5 +234,6 @@ OnigEncodingType OnigEncodingISO_8859_16 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_2.c b/src/iso8859_2.c
index 7282780d87dd4c88907ff1ebc53b499e7da7f6a0..16c1549cce7e09af05a912df1415f96cdedef834 100644 (file)
--- a/src/iso8859_2.c
+++ b/src/iso8859_2.c
@@ -232,5 +232,6 @@ OnigEncodingType OnigEncodingISO_8859_2 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_3.c b/src/iso8859_3.c
index 40ca94c1d0998c25c3055e26e16f33cdc76f0656..549f01e1a2727120c7c29f4116aba3e7c4915a27 100644 (file)
--- a/src/iso8859_3.c
+++ b/src/iso8859_3.c
@@ -232,5 +232,6 @@ OnigEncodingType OnigEncodingISO_8859_3 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_4.c b/src/iso8859_4.c
index 5e7739142aee0c3ece5140e85d947a787abc8887..74b3a882ae0e7a241cb323bafa9c0dcb59ae1af4 100644 (file)
--- a/src/iso8859_4.c
+++ b/src/iso8859_4.c
@@ -234,5 +234,6 @@ OnigEncodingType OnigEncodingISO_8859_4 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_5.c b/src/iso8859_5.c
index a6b41f1f902ad3944500600ee30354e2bdd0a347..70c799a4c0687a16f61272e889e079327793804b 100644 (file)
--- a/src/iso8859_5.c
+++ b/src/iso8859_5.c
@@ -223,5 +223,6 @@ OnigEncodingType OnigEncodingISO_8859_5 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_6.c b/src/iso8859_6.c
index 7217ace9aca3b910228432b7198d8d53d52f83ed..e36579a1fe2bbecc37c451e20a90d20870b4b69b 100644 (file)
--- a/src/iso8859_6.c
+++ b/src/iso8859_6.c
@@ -93,5 +93,6 @@ OnigEncodingType OnigEncodingISO_8859_6 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_7.c b/src/iso8859_7.c
index fb18d9c91e4e546b6ba131ec5d88cb3910d5e73c..87a1acdd0556b63ca3f67b8884efe82ee9076e67 100644 (file)
--- a/src/iso8859_7.c
+++ b/src/iso8859_7.c
@@ -219,5 +219,6 @@ OnigEncodingType OnigEncodingISO_8859_7 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_8.c b/src/iso8859_8.c
index cd652dff9a16134b735ec3d21b99d0c46470455f..e34a3bbf72f6237788c9ad69829779c881d6dc9f 100644 (file)
--- a/src/iso8859_8.c
+++ b/src/iso8859_8.c
@@ -93,5 +93,6 @@ OnigEncodingType OnigEncodingISO_8859_8 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/iso8859_9.c b/src/iso8859_9.c
index 957347cd3d30545c7ace6ba366a78dc548541ba6..8cbbbd61f8ea32da84481ceac47ef6ce74115720 100644 (file)
--- a/src/iso8859_9.c
+++ b/src/iso8859_9.c
@@ -225,5 +225,6 @@ OnigEncodingType OnigEncodingISO_8859_9 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/koi8.c b/src/koi8.c
index 76bcc8c034fea275c7e103079e4a96486aff1643..9c1177647420608b19ec528ec3089466846da322 100644 (file)
--- a/src/koi8.c
+++ b/src/koi8.c
@@ -247,5 +247,6 @@ OnigEncodingType OnigEncodingKOI8 = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/koi8_r.c b/src/koi8_r.c
index 18a0a82faae5df0d9bf8e9f8b824e39120f5ae89..2f090f482b49354feaf113d344d42055d3dd0a1f 100644 (file)
--- a/src/koi8_r.c
+++ b/src/koi8_r.c
@@ -209,5 +209,6 @@ OnigEncodingType OnigEncodingKOI8_R = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/oniguruma.h b/src/oniguruma.h
index 33e80566261e1d865fb8368ff0415ccfb425a534..4257d2d3f084a7f2048e4ecdc536df3e77a05267 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -165,6 +165,7 @@ typedef struct OnigEncodingTypeST {
   OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p);
   int    (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end);
   int    (*init)(void);
+  int    (*is_initialized)(void);
 } OnigEncodingType;
 
 typedef OnigEncodingType* OnigEncoding;

diff --git a/src/sjis.c b/src/sjis.c
index bda8247cc2fda1fc4e4769fa9a74ee88027dfc48..84843ae538e5450b4f41b2af914508533e3dc40e 100644 (file)
--- a/src/sjis.c
+++ b/src/sjis.c
@@ -302,5 +302,6 @@ OnigEncodingType OnigEncodingSJIS = {
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/utf16_be.c b/src/utf16_be.c
index e90adc4b2ebd39da61c69e38f600f42144a14765..e93b42a55e01a099f74157dc83acf846ae65f86f 100644 (file)
--- a/src/utf16_be.c
+++ b/src/utf16_be.c
@@ -223,5 +223,6 @@ OnigEncodingType OnigEncodingUTF16_BE = {
   onigenc_utf16_32_get_ctype_code_range,
   utf16be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/utf16_le.c b/src/utf16_le.c
index dbc95e0c0e4a7e34bae6cf59da262e0f50e29e2b..2d9af522382fd7e68961711cd1aa92b3ee2436d6 100644 (file)
--- a/src/utf16_le.c
+++ b/src/utf16_le.c
@@ -224,5 +224,6 @@ OnigEncodingType OnigEncodingUTF16_LE = {
   onigenc_utf16_32_get_ctype_code_range,
   utf16le_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/utf32_be.c b/src/utf32_be.c
index 49418ee113c682557736785c7932f3e2bf789d30..b8f64afd0981faaa4b087f72df0e6db22b711ba2 100644 (file)
--- a/src/utf32_be.c
+++ b/src/utf32_be.c
@@ -182,5 +182,6 @@ OnigEncodingType OnigEncodingUTF32_BE = {
   onigenc_utf16_32_get_ctype_code_range,
   utf32be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/utf32_le.c b/src/utf32_le.c
index 06ab62e6ba86adfc1c2c584f8302bd6d7aaf8abc..a5a048edc43c5912d6440b927ec7dc74af206a6d 100644 (file)
--- a/src/utf32_le.c
+++ b/src/utf32_le.c
@@ -182,5 +182,6 @@ OnigEncodingType OnigEncodingUTF32_LE = {
   onigenc_utf16_32_get_ctype_code_range,
   utf32le_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };

diff --git a/src/utf8.c b/src/utf8.c
index 7ccb0610320dd31877a727d342f34946f4030e2b..b78e7ebf8f53b2e1e04a7c3d351a03d00699bc28 100644 (file)
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -302,5 +302,6 @@ OnigEncodingType OnigEncodingUTF8 = {
   get_ctype_code_range,
   left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  NULL /* init */
+  NULL, /* init */
+  NULL  /* is_initialized */
 };