Changeset c314f39 for message.c

Timestamp:

May 16, 2010, 1:15:25 AM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

20aced3

Parents:

3f6555d

git-author:

David Benjamin <davidben@mit.edu> (05/15/10 17:47:54)

git-committer:

David Benjamin <davidben@mit.edu> (05/16/10 01:15:25)

Message:

We intern strings, so use this to punt the strcmp

Signed-off-by: David Benjamin <davidben@mit.edu>

File:

• message.c (modified) (3 diffs)

message.c

@@ -61 +61 @@
   owl_pair *p = NULL, *pair = NULL;
 
+  attrname = g_intern_string(attrname);
+
   /* look for an existing pair with this key, */
   j=owl_list_get_size(&(m->attributes));
   for (i=0; i<j; i++) {
     p=owl_list_get_element(&(m->attributes), i);
-    if (!strcmp(owl_pair_get_key(p), attrname)) {
+    if (owl_pair_get_key(p) == attrname) {
       owl_free(owl_pair_get_value(p));
       pair = p;
@@ -74 +76 @@
   if(pair ==  NULL) {
     pair = owl_malloc(sizeof(owl_pair));
-    owl_pair_create(pair, g_intern_string(attrname), NULL);
+    owl_pair_create(pair, attrname, NULL);
     owl_list_append_element(&(m->attributes), pair);
   }
@@ -87 +89 @@
   int i, j;
   owl_pair *p;
+  GQuark quark;
+
+  quark = g_quark_try_string(attrname);
+  if (quark == 0)
+    /* don't bother inserting into string table */
+    return NULL;
+  attrname = g_quark_to_string(quark);
 
   j=owl_list_get_size(&(m->attributes));
   for (i=0; i<j; i++) {
     p=owl_list_get_element(&(m->attributes), i);
-    if (!strcmp(owl_pair_get_key(p), attrname)) {
+    if (owl_pair_get_key(p) == attrname) {
       return(owl_pair_get_value(p));
     }