add ERROR ONIGERR_LIBRARY_IS_NOT_INITIALIZED

diff --git a/src/oniguruma.h b/src/oniguruma.h
index 5555400e2f85592d4f796d64f57fffd47dfd2fd3..33e80566261e1d865fb8368ff0415ccfb425a534 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -588,6 +588,7 @@ ONIG_EXTERN OnigSyntaxType*   OnigDefaultSyntax;
 #define ONIGERR_TOO_BIG_WIDE_CHAR_VALUE                      -401
 #define ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION           -402
 #define ONIGERR_INVALID_COMBINATION_OF_OPTIONS               -403
+#define ONIGERR_LIBRARY_IS_NOT_INITIALIZED                   -500
 
 /* errors related to thread */
 /* #define ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT                -1001 */

diff --git a/src/regcomp.c b/src/regcomp.c
index a398e65807e3115ff96750675fd1b81f65a5b628..ed31eea5db42a1cc95e50fa76ac850e5e793483c 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -5416,6 +5416,9 @@ onig_reg_init(regex_t* reg, OnigOptionType option,
              OnigCaseFoldType case_fold_flag,
              OnigEncoding enc, OnigSyntaxType* syntax)
 {
+  if (onig_inited == 0)
+    return ONIGERR_LIBRARY_IS_NOT_INITIALIZED;
+
   if (IS_NULL(reg))
     return ONIGERR_INVALID_ARGUMENT;
 

diff --git a/src/regerror.c b/src/regerror.c
index 9b6a9e1d8910f2542799e1156bc845b22f61db91..94a163ecdb53a60fe4b0c92534e5b0adb747aa86 100644 (file)
--- a/src/regerror.c
+++ b/src/regerror.c
@@ -172,6 +172,8 @@ onig_error_code_to_format(int code)
     p = "not supported encoding combination"; break;
   case ONIGERR_INVALID_COMBINATION_OF_OPTIONS:
     p = "invalid combination of options"; break;
+  case ONIGERR_LIBRARY_IS_NOT_INITIALIZED:
+    p = "library is not initialized"; break;
 
   default:
     p = "undefined error code"; break;

diff --git a/src/regposix.c b/src/regposix.c
index 9d68dcdab32eebb6a5b9a8916b31d242e7951c2f..e7506144a34bb509e497babe67de931a99875b5a 100644 (file)
--- a/src/regposix.c
+++ b/src/regposix.c
@@ -113,8 +113,8 @@ onig2posix_error_code(int code)
     { ONIGERR_NEVER_ENDING_RECURSION,                     REG_BADPAT },
     { ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY,      REG_BADPAT },
     { ONIGERR_INVALID_CHAR_PROPERTY_NAME,                 REG_BADPAT },
-    { ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION,         REG_EONIG_BADARG }
-
+    { ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION,         REG_EONIG_BADARG },
+    { ONIGERR_LIBRARY_IS_NOT_INITIALIZED,                 REG_EONIG_INTERNAL }
   };
 
   int i;