[macruby-changes] [2302] MacRuby/trunk/string.c

[source_changes at macosforge.org]

Revision: 2302
          http://trac.macosforge.org/projects/ruby/changeset/2302
Author:   lsansonetti at apple.com
Date:     2009-08-12 21:20:20 -0700 (Wed, 12 Aug 2009)
Log Message:
-----------
String#inspect: better escaping of non ASCII characters

Modified Paths:
--------------
    MacRuby/trunk/string.c

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2009-08-13 03:10:54 UTC (rev 2301)
+++ MacRuby/trunk/string.c	2009-08-13 04:20:20 UTC (rev 2302)
@@ -2545,7 +2545,7 @@
 	    __append_escape(out, 'e');
 	}
 	else {
-	    CFStringAppendFormat(out, NULL, CFSTR("\\x%X"), c);
+	    CFStringAppendFormat(out, NULL, CFSTR("\\x%02X"), c);
 	}
     }
     __append(out, '"');
@@ -5378,12 +5378,13 @@
 static void inline
 rb_bytestring_copy_cfstring_content(VALUE bstr, CFStringRef str)
 {
-	if (CFStringGetLength(str) == 0) return;
-    const char *cptr = CFStringGetCStringPtr(str, kCFStringEncodingUTF8);
-    assert(cptr != NULL); // TODO handle UTF-16 strings
+    if (CFStringGetLength(str) != 0) {
+	const char *cptr = CFStringGetCStringPtr(str, kCFStringEncodingUTF8);
+	assert(cptr != NULL); // TODO handle UTF-16 strings
 
-    CFDataAppendBytes(rb_bytestring_wrapped_data(bstr), (UInt8 *)cptr, 
-	    CFStringGetLength(str));
+	CFDataAppendBytes(rb_bytestring_wrapped_data(bstr), (UInt8 *)cptr, 
+		CFStringGetLength(str));
+    }
 }
 
 static VALUE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090812/466ff389/attachment.html>