[macruby-changes] [1807] MacRuby/branches/experimental/encoding.c

[source_changes at macosforge.org]

Revision: 1807
          http://trac.macosforge.org/projects/ruby/changeset/1807
Author:   lsansonetti at apple.com
Date:     2009-06-08 15:10:00 -0700 (Mon, 08 Jun 2009)
Log Message:
-----------
fixed Encoding#name for 10.6

Modified Paths:
--------------
    MacRuby/branches/experimental/encoding.c

Modified: MacRuby/branches/experimental/encoding.c
===================================================================
--- MacRuby/branches/experimental/encoding.c	2009-06-08 22:09:17 UTC (rev 1806)
+++ MacRuby/branches/experimental/encoding.c	2009-06-08 22:10:00 UTC (rev 1807)
@@ -218,7 +218,7 @@
 static VALUE
 enc_name(VALUE self, SEL sel)
 {
-    return (VALUE)CFStringConvertEncodingToIANACharSetName(rb_enc_to_enc(self));
+    return rb_enc_name2(rb_enc_to_enc_ptr(self));
 }
 
 static VALUE
@@ -461,10 +461,14 @@
 VALUE
 rb_enc_name2(rb_encoding *enc)
 {
-    CFStringRef str;
-    if (enc != NULL 
-	&& (str = CFStringConvertEncodingToIANACharSetName(*enc)) != NULL)
-	return (VALUE)str;
+    if (enc != NULL) {
+	CFStringRef str = CFStringConvertEncodingToIANACharSetName(*enc);
+	if (str != NULL) {
+	    VALUE name = rb_str_dup((VALUE)str);
+	    CFStringUppercase((CFMutableStringRef)name, NULL);
+	    return name;
+	}
+    }
     return Qnil;
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090608/16684c25/attachment.html>