[macruby-changes] [2435] MacRuby/trunk/re.c

[source_changes at macosforge.org]

Revision: 2435
          http://trac.macosforge.org/projects/ruby/changeset/2435
Author:   lsansonetti at apple.com
Date:     2009-08-29 19:59:29 -0700 (Sat, 29 Aug 2009)
Log Message:
-----------
let's assume any exotic encoding is 8 bits (for now...)

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

Modified: MacRuby/trunk/re.c
===================================================================
--- MacRuby/trunk/re.c	2009-08-30 01:14:37 UTC (rev 2434)
+++ MacRuby/trunk/re.c	2009-08-30 02:59:29 UTC (rev 2435)
@@ -1299,6 +1299,10 @@
     }
     CFStringEncoding enc = CFStringGetFastestEncoding((CFStringRef)str);
     switch (enc) {
+	default:
+	    // The user probably has the __CF_USER_TEXT_ENCODING environment
+	    // variable set to some exotic encoding, let's assume it's a
+	    // 8 bits one & fall through.
 	case kCFStringEncodingMacRoman:
 	case kCFStringEncodingWindowsLatin1:
 	case kCFStringEncodingISOLatin1:
@@ -1319,12 +1323,15 @@
 	    return (rb_encoding *)ONIG_ENCODING_UTF16_LE;
     }
 
+#if 0
+    // Never reached.
     CFStringRef enc_name = CFStringConvertEncodingToIANACharSetName(enc);
     rb_raise(rb_eArgError,
 	    "given string `%s' has unrecognized encoding `%s' (%ld)",
 	    RSTRING_PTR(rb_inspect(str)),
 	    enc_name == NULL ? "unknown" : RSTRING_PTR(enc_name),
 	    (long)enc);
+#endif
 #if 0
     rb_encoding *enc = 0;
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090829/521d1fab/attachment.html>