Changeset 23fddad for filter.c

Timestamp:

Oct 23, 2009, 11:01:30 PM (15 years ago)

Author:

Karl Ramm <kcr@1ts.org>

Branches:

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

Children:

8590774

Parents:

52761cc

git-author:

Karl Ramm <kcr@1ts.org> (09/30/09 10:12:27)

git-committer:

Karl Ramm <kcr@1ts.org> (10/23/09 23:01:30)

Message:

refactor & rename filter creation & storage management

filter_init_fromstring -> filter_new_fromstring
filter_init -> filter_new
filter_free -> filter_delete

Every time owl_filter_init and owl_filter_init_fromstring were called,
there was a call to malloc right above them;  Conversely, after every
owl_filter_free there needed to be a call to owl_free (and sometimes
there wasn't).

File:

• filter.c (modified) (3 diffs)

filter.c

@@ -2 +2 @@
 #include "owl.h"
 
-int owl_filter_init_fromstring(owl_filter *f, const char *name, const char *string)
-{
+owl_filter *owl_filter_new_fromstring(const char *name, const char *string)
+{
+  owl_filter *f;
   char **argv;
-  int argc, out;
-
-  argv=owl_parseline(string, &argc);
-  out=owl_filter_init(f, name, argc, strs(argv));
+  int argc;
+
+  argv = owl_parseline(string, &argc);
+  f = owl_filter_new(name, argc, strs(argv));
   owl_parsefree(argv, argc);
-  return(out);
-}
-
-int owl_filter_init(owl_filter *f, const char *name, int argc, const char *const *argv)
-{
+
+  return f;
+}
+
+owl_filter *owl_filter_new(const char *name, int argc, const char *const *argv)
+{
+  owl_filter *f;
+
+  f = owl_malloc(sizeof(owl_filter));
+
   f->name=owl_strdup(name);
   f->fgcolor=OWL_COLOR_DEFAULT;
@@ -40 +46 @@
   }
 
-  if(!(f->root = owl_filter_parse_expression(argc, argv, NULL)))
-    return(-1);
+  if (!(f->root = owl_filter_parse_expression(argc, argv, NULL))) {
+    owl_filter_delete(f);
+    return NULL;
+  }
 
   /* Now check for recursion. */
   if (owl_filter_is_toodeep(f)) {
     owl_function_error("Filter loop!");
-    owl_filter_free(f);
-    return(-1);
-  }
-
-  return(0);
+    owl_filter_delete(f);
+    return NULL;
+  }
+
+  return f;
 }
 
@@ -255 +263 @@
 }
 
-void owl_filter_free(owl_filter *f)
-{
-  if(f->root) {
+void owl_filter_delete(owl_filter *f)
+{
+  if (f == NULL)
+    return;
+  if (f->root) {
     owl_filterelement_free(f->root);
     owl_free(f->root);
   }
-  if (f->name) owl_free(f->name);
-}
+  if (f->name)
+    owl_free(f->name);
+  owl_free(f);
+}