[svn:parrot] r48869 - branches/hash_inlined_func/src

[luben at svn.parrot.org]

Author: luben
Date: Wed Sep  8 22:08:52 2010
New Revision: 48869
URL: https://trac.parrot.org/parrot/changeset/48869

Log:
fix ambigous code in hash key comparison

Modified:
   branches/hash_inlined_func/src/hash.c

Modified: branches/hash_inlined_func/src/hash.c
==============================================================================
--- branches/hash_inlined_func/src/hash.c	Wed Sep  8 21:10:11 2010	(r48868)
+++ branches/hash_inlined_func/src/hash.c	Wed Sep  8 22:08:52 2010	(r48869)
@@ -1260,12 +1260,11 @@
                 break;
             /* manually inline part of string_equal  */
             if (hashval == s2->hashval) {
-                if (s->encoding == s2->encoding) 
+                if (s->encoding == s2->encoding){ 
                     if ((STRING_byte_length(s) == STRING_byte_length(s2))
                     && (memcmp(s->strstart, s2->strstart, STRING_byte_length(s)) == 0))
                         break;
-                else
-                    if (STRING_equal(interp, s, s2))
+                } else if (STRING_equal(interp, s, s2))
                         break;
             }
 
@@ -1366,12 +1365,11 @@
                 break;
             /* manually inline part of string_equal  */
             if (hashval == s2->hashval) {
-                if (s->encoding == s2->encoding) 
+                if (s->encoding == s2->encoding) {
                     if ((STRING_byte_length(s) == STRING_byte_length(s2))
                     && (memcmp(s->strstart, s2->strstart, STRING_byte_length(s)) == 0))
                         break;
-                else
-                    if (STRING_equal(interp, s, s2))
+                } else if (STRING_equal(interp, s, s2))
                         break;
             }
             bucket = bucket->next;