remove is_initialized() member from some encodings

diff --git a/src/ascii.c b/src/ascii.c
index 750e78c4eb589da8fcac32c2143a4b09e4237f8c..cf4d4849e367555e17f37bc60373a56512c04dba 100644 (file)
--- a/src/ascii.c
+++ b/src/ascii.c
@@ -29,12 +29,9 @@
 
 #include "regint.h"   /* for USE_CALLOUT */
 
-static int inited;
-
 static int
 init(void)
 {
-  if (inited == 0) {
 #ifdef USE_CALLOUT
 
     int id;
@@ -63,17 +60,18 @@ init(void)
 
 #endif /* USE_CALLOUT */
 
-    inited = 1;
-  }
-
   return ONIG_NORMAL;
 }
 
+#if 0
 static int
 is_initialized(void)
 {
-  return inited;
+  /* Don't use this function */
+  /* can't answer, because builtin callout entries removed in onig_end() */
+  return 0;
 }
+#endif
 
 static int
 ascii_is_code_ctype(OnigCodePoint code, unsigned int ctype)
@@ -102,6 +100,6 @@ OnigEncodingType OnigEncodingASCII = {
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
   init,
-  is_initialized,
+  0, /* is_initialized */
   onigenc_always_true_is_valid_mbc_string
 };

diff --git a/src/utf16_be.c b/src/utf16_be.c
index 865a4a09f359de7a2ed0ab22354e2892a10f70ce..c6820e40eb90ed3578c0764fe4965071cf24315b 100644 (file)
--- a/src/utf16_be.c
+++ b/src/utf16_be.c
@@ -30,12 +30,9 @@
 #include "regint.h"  /* for USE_CALLOUT */
 
 
-static int inited;
-
 static int
 init(void)
 {
-  if (inited == 0) {
 #ifdef USE_CALLOUT
 
     int id;
@@ -65,19 +62,9 @@ init(void)
 
 #endif /* USE_CALLOUT */
 
-    inited = 1;
-  }
-
   return ONIG_NORMAL;
 }
 
-static int
-is_initialized(void)
-{
-  return inited;
-}
-
-
 static const int EncLen_UTF16[] = {
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -279,6 +266,6 @@ OnigEncodingType OnigEncodingUTF16_BE = {
   utf16be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
   init,
-  is_initialized,
+  0, /* is_initialized */
   is_valid_mbc_string
 };

diff --git a/src/utf16_le.c b/src/utf16_le.c
index 15c652819c4e561ba77832491797ef6468468977..d2cdd9eff3085a0c4ab1965bb981ddf70ee7bdbd 100644 (file)
--- a/src/utf16_le.c
+++ b/src/utf16_le.c
@@ -26,16 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
 #include "regint.h"  /* for USE_CALLOUT */
 
-
-static int inited;
-
 static int
 init(void)
 {
-  if (inited == 0) {
 #ifdef USE_CALLOUT
 
     int id;
@@ -65,19 +60,9 @@ init(void)
 
 #endif /* USE_CALLOUT */
 
-    inited = 1;
-  }
-
   return ONIG_NORMAL;
 }
 
-static int
-is_initialized(void)
-{
-  return inited;
-}
-
-
 static const int EncLen_UTF16[] = {
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -289,6 +274,6 @@ OnigEncodingType OnigEncodingUTF16_LE = {
   utf16le_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
   init,
-  is_initialized,
+  0, /* is_initialized */
   is_valid_mbc_string
 };