Changeset 9359 for trunk

Timestamp:

Oct 6, 2006, 10:28:33 AM (20 years ago)

Author:

eugene

Message:

squashing queue leaks

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/queuepop.c (modified) (3 diffs)
• cmd.data/test/queues.sh (added)
• lib.data/queues.c (modified) (4 diffs)

trunk/Ohana/src/opihi/cmd.data/queuepop.c

@@ -18 +18 @@
 
   Key = NULL;
+  Value = NULL;
   if ((N = get_argument (argc, argv, "-key"))) {
     remove_argument (N, &argc, argv);
@@ -49 +50 @@
       return (FALSE);
     } else {
-      gprint (GP_ERR, "%s\n", line);
+      gprint (GP_LOG, "%s\n", line);
+      free (line);
       return (TRUE);
     }
@@ -58 +60 @@
   } else {
     set_str_variable (var, line);
+    free (line);
   }
 
-  free (line);
+  free (var);
   if (Key != NULL) free (Key);
+  if (Value != NULL) free (Value);
 
   return (TRUE);

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

@@ -141 +141 @@
 }
 
+// return a newly allocated string containing the requested key value
 char *ChooseSingleKey (char *line, int Key) {
 
@@ -146 +147 @@
   char *key, *p;
 
+  if (Key == -1) {
+    key = strcreate (line);
+    return (key);
+  }
+
   key = line;
-  if (Key == -1) return line;
-
   for (i = 0; (i < Key) && (key != NULL); i++) {
     p = nextword (key);
@@ -192 +196 @@
     first = FALSE;
   }
-
   return (output);
 }
@@ -337 +340 @@
       test = ChooseKey (queue[0].lines[i], Key);
       if (test == NULL) continue;
-      if (strcmp (value, test)) continue;
+      if (strcmp (value, test)) { 
+        free (test);
+        continue;
+      }
+      free (test);
       choice = i;
   }