--2i6OFdgZWr4HNMKA6kN
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Wed, 2003-06-25 at 02:01, nobu.nokada / softhome.net wrote:
> The first argument to rb_warn() is printf-like format, so you
> don't need concatination.

Eh... It figures that I'd miss something like this... okay, but if
that's all that's wrong with it this time, it should be actually be
ready to go now (though, that's what I thought the last two times :)

-jivera

--2i6OFdgZWr4HNMKA6kN
Content-Disposition: attachment; filename=class.patch
Content-Type: text/plain; name=class.patch; charset=
Content-Transfer-Encoding: 7bit

--- class-old.c	2003-06-20 02:11:40.000000000 -0500
+++ class.c	2003-06-25 06:18:55.000000000 -0500
@@ -549,18 +549,20 @@
     return ary;
 }
 
-VALUE
-rb_class_instance_methods(argc, argv, mod)
+static VALUE
+rb_generic_class_instance_methods(argc, argv, mod, func)
     int argc;
     VALUE *argv;
     VALUE mod;
+    void (*func)();
 {
     VALUE recur;
 
     rb_scan_args(argc, argv, "01", &recur);
     if (argc 0) {
 #if RUBY_VERSION_CODE < 181
-	rb_warn("instance_methods parameter will default to 'true' after 1.8.1");
+	rb_warn("%s parameter will default to 'true' as of 1.8.1",
+		rb_id2name(rb_frame_last_func()));
 #else
 	recur  true;
 #endif
@@ -569,22 +571,21 @@
 }
 
 VALUE
-rb_class_protected_instance_methods(argc, argv, mod)
+rb_class_instance_methods(argc, argv, mod)
     int argc;
     VALUE *argv;
     VALUE mod;
 {
-    VALUE recur;
+    return rb_generic_class_instance_methods(argc, argv, mod, ins_methods_i);
+}
 
-    rb_scan_args(argc, argv, "01", &recur);
-    if (argc 0) {
-#if RUBY_VERSION_CODE < 181
-	rb_warn("protected_instance_methods parameter will default to 'true' after 1.8.1");
-#else
-	recur  true;
-#endif
-    }
-    return method_list(mod, RTEST(recur), ins_methods_prot_i);
+VALUE
+rb_class_protected_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    return rb_generic_class_instance_methods(argc, argv, mod, ins_methods_prot_i);
 }
 
 VALUE
@@ -593,17 +594,7 @@
     VALUE *argv;
     VALUE mod;
 {
-    VALUE recur;
-
-    rb_scan_args(argc, argv, "01", &recur);
-    if (argc 0) {
-#if RUBY_VERSION_CODE < 181
-	rb_warn("private_instance_methods parameter will default to 'true' after 1.8.1");
-#else
-	recur  true;
-#endif
-    }
-    return method_list(mod, RTEST(recur), ins_methods_priv_i);
+    return rb_generic_class_instance_methods(argc, argv, mod, ins_methods_priv_i);
 }
 
 VALUE
@@ -612,17 +603,7 @@
     VALUE *argv;
     VALUE mod;
 {
-    VALUE recur;
-
-    rb_scan_args(argc, argv, "01", &recur);
-    if (argc 0) {
-#if RUBY_VERSION_CODE < 181
-	rb_warn("public_instance_methods parameter will default to 'true' after 1.8.1");
-#else
-	recur  true;
-#endif
-    }
-    return method_list(mod, RTEST(recur), ins_methods_pub_i);
+    return rb_generic_class_instance_methods(argc, argv, mod, ins_methods_pub_i);
 }
 
 VALUE

--2i6OFdgZWr4HNMKA6kN--