From fad8b1cefafcc40ca86cd87612ed8597ee600da3 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Fri, 10 May 2013 22:09:02 +0900
Subject: change mrb_warn to get mrb_state and %S formatter

---
 src/class.c |  5 ++---
 src/error.c | 14 ++++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/class.c b/src/class.c
index 47ea42228..8476ffa6c 100644
--- a/src/class.c
+++ b/src/class.c
@@ -255,13 +255,12 @@ mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, s
   if (mrb_const_defined_at(mrb, outer, id)) {
     c = class_from_sym(mrb, outer, id);
     if (mrb_class_real(c->super) != super) {
-        mrb_name_error(mrb, id, "%S is already defined", mrb_sym2str(mrb, id));
+      mrb_name_error(mrb, id, "%S is already defined", name);
     }
     return c;
   }
   if (!super) {
-    mrb_warn("no super class for `%S::%S', Object assumed",
-             mrb_obj_value(outer), mrb_sym2str(mrb, id));
+    mrb_warn(mrb, "no super class for `%S::%S', Object assumed", outer, name);
   }
   c = mrb_class_new(mrb, super);
   setup_class(mrb, mrb_obj_value(outer), c, id);
diff --git a/src/error.c b/src/error.c
index d4e13fc96..37914666f 100644
--- a/src/error.c
+++ b/src/error.c
@@ -312,15 +312,17 @@ mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...)
 }
 
 void
-mrb_warn(const char *fmt, ...)
+mrb_warn(mrb_state *mrb, const char *fmt, ...)
 {
 #ifdef ENABLE_STDIO
-  va_list args;
+  va_list ap;
+  mrb_value str;
 
-  va_start(args, fmt);
-  printf("warning: ");
-  vprintf(fmt, args);
-  va_end(args);
+  va_start(ap, fmt);
+  str = mrb_vformat(mrb, fmt, ap);
+  fputs("warning: ", stderr);
+  fwrite(RSTRING_PTR(str), RSTRING_LEN(str), 1, stderr);
+  va_end(ap);
 #endif
 }
 
-- 
cgit v1.2.3