Changeset 3922 for trunk/Ohana/src/opihi/lib.shell/ListOps.c

Timestamp:

May 12, 2005, 10:09:10 PM (21 years ago)

Author:

eugene

Message:

cleaned up memory leaks

File:

• trunk/Ohana/src/opihi/lib.shell/ListOps.c (modified) (4 diffs)

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

@@ -39 +39 @@
 int is_for_loop (char *line) {
 
+  int status;
   char *comm;
 
   comm = thisword (line);
   if (comm == (char *) NULL) return (FALSE);
-
-  if (strcmp (comm, "for")) {
-    free (comm);
-    return (FALSE);
-  }
-
-  return (TRUE);
-
+  
+  status = !strcmp (comm, "for");
+  free (comm);
+  return (status);
 }
 
 int is_macro_create (char *line) {
 
-  int i, N;
+  int i, N, status;
   char *comm;
   char *this_macro;
 
+  comm = thisword (line);
+  if (comm == (char *) NULL) return (FALSE);
 
-  comm = thisword (line);
-  if (comm == (char *) NULL)
-    return (FALSE);
-  if (strcmp (comm, "macro")) {
-    free (comm);
-    return (FALSE);
-  }
+  status = !strcmp (comm, "macro");
+  free (comm);
+  if (!status) return (FALSE);
   
   this_macro = thisword (nextword (line));
 
-  if (this_macro == (char *)NULL) {
-    return (FALSE);
-  }
+  if (this_macro == (char *)NULL) return (FALSE);
 
   N = sizeof (in_macro) / sizeof (Command);
@@ -101 +94 @@
   if (strcmp (comm, "if")) goto escape;
 
+  /* if (cond) break does not define a complete block */
   if ((temp != NULL) && !strcmp (temp, "break")) goto escape;
 
-  free (comm);
+  if (temp != NULL) free (temp);
+  if (comm != NULL) free (comm);
   return (TRUE);
 
@@ -114 +109 @@
 int is_loop (char *line) {
 
+  int status;
   char *comm;
 
@@ -119 +115 @@
   if (comm == (char *) NULL) return (FALSE);
 
-  if (strcmp (comm, "while")) {
-    free (comm);
-    return (FALSE);
-  }
+  status = !strcmp (comm, "while");
   free (comm);
-  return (TRUE);
+  return (status);
 }