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

[source_changes at macosforge.org]

Revision: 173
          http://trac.macosforge.org/projects/ruby/changeset/173
Author:   lsansonetti at apple.com
Date:     2008-04-25 17:28:10 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
work around string#tr temporary limitation

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

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2008-04-26 00:26:22 UTC (rev 172)
+++ MacRuby/trunk/string.c	2008-04-26 00:28:10 UTC (rev 173)
@@ -169,8 +169,9 @@
 	    (CFStringRef)str, kCFStringEncodingUTF8, 0);
 	if (data == NULL)
 	    return NULL;
-#if 1 
-	GC_WB(&s->cfdata, (void *)CFDataCreateCopy(NULL, data));
+#if 0 
+	CFMutableDataRef mdata = CFDataCreateMutableCopy(NULL, 0, data); 
+	GC_WB(&s->cfdata, (void *)mdata);
 	CFRelease((CFTypeRef)data);
 #else
 	GC_WB(&s->cfdata, (void *)data);
@@ -220,10 +221,10 @@
 		false,
 		kCFAllocatorNull);
 	CFStringReplaceAll((CFMutableStringRef)str, (CFStringRef)bytestr);
-        if (memcmp((const char *)dataptr, (const char *)RSTRING_CPTR(str), 
-	    datalen) == 0) {
+//        if (memcmp((const char *)dataptr, (const char *)RSTRING_CPTR(str), 
+//	    datalen) == 0) {
 	    s->cfdata = NULL;
-	}
+//	}
     }
 }
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080425/5c35c98b/attachment-0001.html