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

[source_changes at macosforge.org]

Revision: 279
          http://trac.macosforge.org/projects/ruby/changeset/279
Author:   lsansonetti at apple.com
Date:     2008-06-11 16:51:52 -0700 (Wed, 11 Jun 2008)

Log Message:
-----------
removed some unnecessary code

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

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2008-06-11 23:49:20 UTC (rev 278)
+++ MacRuby/trunk/string.c	2008-06-11 23:51:52 UTC (rev 279)
@@ -525,43 +525,37 @@
     str = str_alloc(klass);
 #if WITH_OBJC
     bool need_padding = len > 0;
-    if (ptr != NULL) {
-	if (len == 0) {
-	    char c = 0;
-	    rb_objc_str_set_bytestring(str, &c, 1);
+    if (ptr != NULL && len > 0) {
+	long slen;
+	slen = strlen(ptr);
+
+	if (slen == len) {
+	    CFStringAppendCString((CFMutableStringRef)str, ptr, 
+		    kCFStringEncodingUTF8);
+	    need_padding = false;
+	    if (CFStringGetLength((CFStringRef)str) != len)
+		rb_objc_str_set_bytestring(str, ptr, len);
 	}
 	else {
-	    long slen;
-	    slen = strlen(ptr);
+	    if (slen == 0 || len < slen) {
+		CFStringRef substr;
 
-	    if (slen == len) {
-		CFStringAppendCString((CFMutableStringRef)str, ptr, 
-			kCFStringEncodingUTF8);
-		need_padding = false;
-		if (CFStringGetLength((CFStringRef)str) != len)
-		    rb_objc_str_set_bytestring(str, ptr, len);
-	    }
-	    else {
-		if (slen == 0 || len < slen) {
-		    CFStringRef substr;
-
-		    substr = CFStringCreateWithBytes(NULL, (const UInt8 *)ptr, 
+		substr = CFStringCreateWithBytes(NULL, (const UInt8 *)ptr, 
 			len, kCFStringEncodingUTF8, false);
-    
-		    rb_gc_malloc_increase(32 + (sizeof(UniChar) * len));
 
-		    if (substr != NULL) {
-			CFStringAppend((CFMutableStringRef)str, substr);
-			CFRelease(substr);		
-		    }
-		    else {
-			rb_objc_str_set_bytestring(str, ptr, len);
-		    }
+		rb_gc_malloc_increase(32 + (sizeof(UniChar) * len));
+
+		if (substr != NULL) {
+		    CFStringAppend((CFMutableStringRef)str, substr);
+		    CFRelease(substr);		
 		}
 		else {
 		    rb_objc_str_set_bytestring(str, ptr, len);
 		}
 	    }
+	    else {
+		rb_objc_str_set_bytestring(str, ptr, len);
+	    }
 	}
     }
     rb_gc_malloc_increase(32 + (sizeof(UniChar) * len));

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080611/9b4a8ea0/attachment.htm