[svn:parrot] r49003 - in trunk/src: . string

[nwellnhof at svn.parrot.org]

Author: nwellnhof
Date: Tue Sep 14 19:11:35 2010
New Revision: 49003
URL: https://trac.parrot.org/parrot/changeset/49003

Log:
Don't use STRING_equal yet

It's not yet safe to use directly.

Modified:
   trunk/src/hash.c
   trunk/src/string/encoding.c

Modified: trunk/src/hash.c
==============================================================================
--- trunk/src/hash.c	Tue Sep 14 19:11:14 2010	(r49002)
+++ trunk/src/hash.c	Tue Sep 14 19:11:35 2010	(r49003)
@@ -291,7 +291,7 @@
     STRING const *s1 = (STRING const *)search_key;
     STRING const *s2 = (STRING const *)bucket_key;
 
-    return STRING_equal(interp, s1, s2) == 0;
+    return Parrot_str_equal(interp, s1, s2) == 0;
 }
 
 
@@ -1391,7 +1391,7 @@
                     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 (Parrot_str_equal(interp, s, s2))
                         break;
             }
 
@@ -1501,7 +1501,7 @@
                         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 (Parrot_str_equal(interp, s, s2))
                             break;
                 }
                 bucket = bucket->next;

Modified: trunk/src/string/encoding.c
==============================================================================
--- trunk/src/string/encoding.c	Tue Sep 14 19:11:14 2010	(r49002)
+++ trunk/src/string/encoding.c	Tue Sep 14 19:11:35 2010	(r49003)
@@ -174,7 +174,7 @@
                 return i;
         }
     }
-    else if (STRING_equal(interp, encodingname, fixed_8_str)) {
+    else if (Parrot_str_equal(interp, encodingname, fixed_8_str)) {
         for (i = 0; i < n; ++i) {
             if (STREQ(encodings[i]->name, "ascii"))
                 return i;