From 8e9fb2e14c4773cb9fd006133bd38f8bc851ff0f Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 10 Oct 2009 18:12:26 +0000
Subject: [PATCH] * regparse.c (onig_syntax_warn): added.

* regparse.c (CC_ESC_WARN, CLOSE_BRACKET_WITHOUT_ESC_WARN,
  CC_DUP_WARN, UNKNOWN_ESC_WARN): use onig_syntax_warn.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  |  7 +++++++
 regparse.c | 51 +++++++++++++++++++++------------------------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index beac0a6f6d..be82816a13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Oct 11 03:10:50 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (onig_syntax_warn): added.
+
+	* regparse.c (CC_ESC_WARN, CLOSE_BRACKET_WITHOUT_ESC_WARN,
+	  CC_DUP_WARN, UNKNOWN_ESC_WARN): use onig_syntax_warn.
+
 Sun Oct 11 00:14:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (marshal_dump, marshal_load): prevent from GC.
diff --git a/regparse.c b/regparse.c
index 30debf7075..8bd89e1fb6 100644
--- a/regparse.c
+++ b/regparse.c
@@ -2845,17 +2845,29 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end,
 #endif /* USE_NAMED_GROUP */
 
 static void
-CC_ESC_WARN(ScanEnv* env, UChar *c)
+onig_syntax_warn(ScanEnv *env, const char *fmt, ...)
+{
+    va_list args;
+    UChar buf[WARN_BUFSIZE];
+    va_start(args, fmt);
+    onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
+		env->pattern, env->pattern_end,
+		(const UChar *)fmt, args);
+    va_end(args);
+    if (env->sourcefile == NULL)
+	rb_warn(fmt, buf);
+    else
+	rb_compile_warn(env->sourcefile, env->sourceline, fmt, buf);
+}
+
+static void
+CC_ESC_WARN(ScanEnv *env, UChar *c)
 {
   if (onig_warn == onig_null_warn) return ;
 
   if (IS_SYNTAX_BV(env->syntax, ONIG_SYN_WARN_CC_OP_NOT_ESCAPED) &&
       IS_SYNTAX_BV(env->syntax, ONIG_SYN_BACKSLASH_ESCAPE_IN_CC)) {
-    UChar buf[WARN_BUFSIZE];
-    onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
-		env->pattern, env->pattern_end,
-                (UChar* )"character class has '%s' without escape", c);
-    (*onig_warn)((char* )buf);
+    onig_syntax_warn(env, "character class has '%s' without escape", c);
   }
 }
 
@@ -2865,48 +2877,27 @@ CLOSE_BRACKET_WITHOUT_ESC_WARN(ScanEnv* env, UChar* c)
   if (onig_warn == onig_null_warn) return ;
 
   if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_OP_NOT_ESCAPED)) {
-    UChar buf[WARN_BUFSIZE];
-    onig_snprintf_with_pattern(buf, WARN_BUFSIZE, (env)->enc,
-		(env)->pattern, (env)->pattern_end,
-		(UChar* )"regular expression has '%s' without escape", c);
-    (*onig_warn)((char* )buf);
+      onig_syntax_warn(env, "regular expression has '%s' without escape", c);
   }
 }
 
 static void
 CC_DUP_WARN(ScanEnv *env)
 {
-  UChar buf[WARN_BUFSIZE];
   if (onig_warn == onig_null_warn || !RTEST(ruby_verbose)) return ;
 
   if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_DUP) &&
     !((env)->warnings_flag & ONIG_SYN_WARN_CC_DUP)) {
     (env)->warnings_flag |= ONIG_SYN_WARN_CC_DUP;
-    onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
-	    env->pattern, env->pattern_end,
-	    (UChar* )"character class has duplicated range");
-
-    if (env->sourcefile == NULL)
-	(*onig_warn)((char* )buf);
-    else
-	rb_compile_warn(env->sourcefile, env->sourceline, (char* )buf);
+    onig_syntax_warn(env, "character class has duplicated range");
   }
 }
 
 static void
 UNKNOWN_ESC_WARN(ScanEnv *env, int c)
 {
-  UChar buf[WARN_BUFSIZE];
   if (onig_warn == onig_null_warn || !RTEST(ruby_verbose)) return ;
-
-  onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc,
-	  env->pattern, env->pattern_end,
-	  (UChar* )"Unknown escape \\%c is ignored", c);
-
-  if (env->sourcefile == NULL)
-      (*onig_warn)((char* )buf);
-  else
-      rb_compile_warn(env->sourcefile, env->sourceline, (char* )buf);
+  onig_syntax_warn(env, "Unknown escape \\%c is ignored", c);
 }
 
 static UChar*