Changeset 3907

Timestamp:

May 12, 2005, 1:07:37 PM (21 years ago)

Author:

eugene

Message:

cleaning up memory leaks

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/input.c (modified) (1 diff)
• cmd.basic/memory.c (modified) (1 diff)
• cmd.basic/run_for.c (modified) (1 diff)
• cmd.basic/run_if.c (modified) (1 diff)
• cmd.basic/run_while.c (modified) (1 diff)
• lib.shell/MacroOps.c (modified) (1 diff)
• lib.shell/macro_create.c (modified) (4 diffs)
• lib.shell/opihi.c (modified) (1 diff)
• pantasks/task.c (modified) (1 diff)
• pantasks/task_macros.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.basic/input.c

@@ -47 +47 @@
     free (inlist.line[i]);
   }
+  free (inlist.line[i]); /* note that we always alloc one extra line */
   free (inlist.line);
   return (status);

trunk/Ohana/src/opihi/cmd.basic/memory.c

@@ -13 +13 @@
     return (TRUE);
   }
+  if (!strncasecmp ("variables", argv[1], strlen(argv[1]))) {
+    ListVariables ();
+    return (TRUE);
+  }
+  if (!strncasecmp ("vectors", argv[1], strlen(argv[1]))) {
+    ListVectors ();
+    return (TRUE);
+  }
+  if (!strncasecmp ("buffers", argv[1], strlen(argv[1]))) {
+    PrintBuffers (0);
+    return (TRUE);
+  }
+  if (!strncasecmp ("macros", argv[1], strlen(argv[1]))) {
+    ListMacros();
+    return (TRUE);
+  }
+  if (!strncasecmp ("commands", argv[1], strlen(argv[1]))) {
+    print_commands (stderr);
+    return (TRUE);
+  }
 
 usage:

trunk/Ohana/src/opihi/cmd.basic/run_for.c

@@ -51 +51 @@
       } 
     }
+    if (ThisList == 0) ohana_memregister (input);
 
     /* test for new macro (or other list, in the future?) */

trunk/Ohana/src/opihi/cmd.basic/run_if.c

@@ -61 +61 @@
       input = strcreate ("end");
     }
+    if (ThisList == 0) ohana_memregister (input);
 
     stripwhite (input);

trunk/Ohana/src/opihi/cmd.basic/run_while.c

@@ -48 +48 @@
       } 
     }
+    if (ThisList == 0) ohana_memregister (input);
 
     /* test for new macro (or other list, in the future?) */

trunk/Ohana/src/opihi/lib.shell/MacroOps.c

@@ -56 +56 @@
   }
   return;
+}
+
+void ListMacros () {
+  int i;
+  for (i = 0; i < Nmacros; i++) {
+    fprintf (stderr, "%s\n", macros[i].name);
+  }
 }
 

trunk/Ohana/src/opihi/lib.shell/macro_create.c

@@ -46 +46 @@
     AddCommand (cmd);
     free (cmd);
-
     macro = NewMacro (argv[1]);
   } else { /**** Old Macro ****/
@@ -58 +57 @@
   NLINES = D_NLINES;
   for (i = 0; i < macro[0].Nlines; i++) free (macro[0].line[i]);
-  ALLOCATE (macro[0].line, char *, NLINES);
+  REALLOCATE (macro[0].line, char *, NLINES);
 
   /* read in macro
@@ -79 +78 @@
       continue;
     }
+    if (ThisList == 0) ohana_memregister (input);
 
     if ((ThisList > 0) && (input == (char *) NULL)) {
@@ -96 +96 @@
         free (input);
         macro[0].Nlines = i;
-        if (macro[0].Nlines == 0) 
-          i = 1;
+        if (macro[0].Nlines == 0) i = 1;
         REALLOCATE (macro[0].line, char *, i);
         return (TRUE);

trunk/Ohana/src/opihi/lib.shell/opihi.c

@@ -43 +43 @@
       add_history (line);
       append_history (1, history);
-      free (line);
       free (list);
     }
+    free (line);
     line = (char *) NULL;
   }

trunk/Ohana/src/opihi/pantasks/task.c

@@ -58 +58 @@
       input = strcreate ("end");
     }
+    if (ThisList == 0) ohana_memregister (input);
 
     stripwhite (input);

trunk/Ohana/src/opihi/pantasks/task_macros.c

@@ -126 +126 @@
       input = strcreate ("end");
     }
+    if (ThisList == 0) ohana_memregister (input);
 
     stripwhite (input);