Revision

643

Author

lsansonetti@apple.com

Date

2008-09-30 12:29:23 -0700 (Tue, 30 Sep 2008)

Log Message

applying cleanup patch from vincent isambart

Modified Paths

• MacRuby/trunk/objc.m
• MacRuby/trunk/vm_insnhelper.c

Diff

--- MacRuby/trunk/objc.m	2008-09-30 19:27:55 UTC (rev 642)
+++ MacRuby/trunk/objc.m	2008-09-30 19:29:23 UTC (rev 643)
@@ -1360,11 +1360,10 @@
 	    char buf[100];
 	    unsigned i;
 
-	    buf[0] = '\0';
 	    type = rb_get_bs_method_type(bs_method, -1);
 	    if (type == NULL)
 		type = [msig methodReturnType];
-	    strlcat(buf, type, sizeof buf);
+	    strlcpy(buf, type, sizeof buf);
 
 	    sig->argc = [msig numberOfArguments];
 	    for (i = 0; i < sig->argc; i++) {

--- MacRuby/trunk/vm_insnhelper.c	2008-09-30 19:27:55 UTC (rev 642)
+++ MacRuby/trunk/vm_insnhelper.c	2008-09-30 19:29:23 UTC (rev 643)
@@ -523,13 +523,11 @@
 {
     VALUE val;
 #if WITH_OBJC
-    NODE *mn;
+    NODE *mn = NULL;
 #if ENABLE_DEBUG_LOGGING
     bool cached = false;
 #endif
 
-    mn = NULL;
-
     if (mcache != NULL) {
 cache_relookup:
 	if (mcache->flags & RB_MCACHE_RCALL_FLAG) {
@@ -728,7 +726,7 @@
 
 start_method_dispatch:
 
-    if (mn != 0) {
+    if (mn != NULL) {
 	if ((mn->nd_noex == 0)) {
 	    /* dispatch method */
 	    NODE *node;