MdeModulePkg RegularExpressionDxe: Update Oniguruma to 6.9.0

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / reggnu.c

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/reggnu.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/reggnu.c
index f9af9ca93c248295ffd8edcd2d0f38dbe0e2f0a3..fb1537eccb2414ce3d9cc0f11a595a7d82f05137 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/reggnu.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/reggnu.c
@@ -2,11 +2,9 @@
   reggnu.c -  Oniguruma (regular expression library)\r
 **********************************************************************/\r
 /*-\r
- * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
+ * Copyright (c) 2002-2018  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
  * All rights reserved.\r
  *\r
- * (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
- *\r
  * Redistribution and use in source and binary forms, with or without\r
  * modification, are permitted provided that the following conditions\r
  * are met:\r
@@ -30,10 +28,7 @@
  */\r
 \r
 #include "regint.h"\r
-\r
-#ifndef ONIGGNU_H\r
 #include "oniggnu.h"\r
-#endif\r
 \r
 extern void\r
 re_free_registers(OnigRegion* r)\r
@@ -56,7 +51,7 @@ re_adjust_startpos(regex_t* reg, const char* string, int size,
     else {\r
       p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, (UChar* )string, s);\r
     }\r
-    return (int)(p - (UChar* )string);\r
+    return (int )(p - (UChar* )string);\r
   }\r
 \r
   return startpos;\r
@@ -95,29 +90,6 @@ re_compile_pattern(const char* pattern, int size, regex_t* reg, char* ebuf)
   return r;\r
 }\r
 \r
-#ifdef USE_RECOMPILE_API\r
-extern int\r
-re_recompile_pattern(const char* pattern, int size, regex_t* reg, char* ebuf)\r
-{\r
-  int r;\r
-  OnigErrorInfo einfo;\r
-  OnigEncoding enc;\r
-\r
-  /* I think encoding and options should be arguments of this function.\r
-     But this is adapted to present re.c. (2002/11/29)\r
-   */\r
-  enc = OnigEncDefaultCharEncoding;\r
-\r
-  r = onig_recompile(reg, (UChar* )pattern, (UChar* )(pattern + size),\r
-                    reg->options, enc, OnigDefaultSyntax, &einfo);\r
-  if (r != ONIG_NORMAL) {\r
-    if (IS_NOT_NULL(ebuf))\r
-      (void )onig_error_code_to_str((UChar* )ebuf, r, &einfo);\r
-  }\r
-  return r;\r
-}\r
-#endif\r
-\r
 extern void\r
 re_free_pattern(regex_t* reg)\r
 {\r
@@ -151,9 +123,9 @@ re_mbcinit(int mb_code)
   case RE_MBCTYPE_ASCII:\r
     enc = ONIG_ENCODING_ASCII;\r
     break;\r
-  default:\r
-    return;\r
   }\r
 \r
+  onig_initialize(&enc, 1);\r
+\r
   onigenc_set_default_encoding(enc);\r
 }\r