Changeset 8427 for trunk/Ohana/src/opihi/lib.data/queues.c

Timestamp:

Aug 20, 2006, 5:36:41 PM (20 years ago)

Author:

eugene

Message:

updated to the new DVO APIs; minor cleanups (unused variables, etc)

File:

• trunk/Ohana/src/opihi/lib.data/queues.c (modified) (2 diffs)

trunk/Ohana/src/opihi/lib.data/queues.c

@@ -232 +232 @@
       key2 = ChooseKey (queue[0].lines[j], Key);
       if (key2 == NULL) continue;
-      if (strcmp (key1, key2)) {
-        if (Key != -1) free (key2);
-        continue;
-      }
-      found = TRUE;
-      if (Key != -1) free (key2);
+      found = !strcmp (key1, key2);
+      free (key2);
     }      
     if (!found) PushQueue (queue, tmp.lines[i]);
-    if (Key != -1) free (key1);
+    free (key1);
   }
   for (i = 0; i < tmp.Nlines; i++) {
@@ -287 +283 @@
       key2 = ChooseKey (queue[0].lines[j], Key);
       if (key2 == NULL) continue;
-      if (strcmp (key1, key2)) {
-        if (Key != -1) free (key2);
-        continue;
+      found = !strcmp (key1, key2);
+      if (found) {
+        // XXX do I need to free queue[0].lines[j]??
+        queue[0].lines[j] = strcreate (tmp.lines[i]);
       }
-      queue[0].lines[j] = strcreate (tmp.lines[i]);
-      found = TRUE;
-      if (Key != -1) free (key2);
+      free (key2);
     }      
     if (!found) PushQueue (queue, tmp.lines[i]);
-    if (Key != -1) free (key1);
+    free (key1);
   }
   for (i = 0; i < tmp.Nlines; i++) {