Changeset 23fddad for functions.c

Timestamp:

Oct 23, 2009, 11:01:30 PM (14 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:

• functions.c (modified) (11 diffs)

functions.c

@@ -2133 +2133 @@
   owl_filter *f;
   const owl_view *v;
-  int ret, inuse=0;
+  int inuse = 0;
 
   if (argc < 2) {
@@ -2183 +2183 @@
 
   /* create the filter and check for errors */
-  f=owl_malloc(sizeof(owl_filter));
-  ret=owl_filter_init(f, argv[1], argc-2, argv+2);
-  if (ret==-1) {
-    owl_free(f);
+  f = owl_filter_new(argv[1], argc-2, argv+2);
+  if (f == NULL) {
     owl_function_error("Invalid filter");
     return;
@@ -2382 +2380 @@
   if (tmpinstance) owl_free(tmpinstance);
 
-  f=owl_malloc(sizeof(owl_filter));
-  owl_filter_init_fromstring(f, filtname, argbuff);
+  f = owl_filter_new_fromstring(filtname, argbuff);
 
   /* add it to the global list */
@@ -2421 +2418 @@
 
   /* create the new-internal filter */
-  f=owl_malloc(sizeof(owl_filter));
-
   esclonguser = owl_text_quote(longuser, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
 
@@ -2430 +2425 @@
       esclonguser);
 
-  owl_filter_init_fromstring(f, filtname, argbuff);
+  f = owl_filter_new_fromstring(filtname, argbuff);
 
   /* add it to the global list */
@@ -2465 +2460 @@
 
   /* create the new-internal filter */
-  f=owl_malloc(sizeof(owl_filter));
-
   escuser = owl_text_quote(user, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
 
@@ -2474 +2467 @@
       escuser, owl_global_get_aim_screenname_for_filters(&g));
 
-  owl_filter_init_fromstring(f, filtname, argbuff);
+  f = owl_filter_new_fromstring(filtname, argbuff);
 
   /* add it to the global list */
@@ -2506 +2499 @@
   argbuff = owl_sprintf("type ^%s$", esctype);
 
-  owl_filter_init_fromstring(f, filtname, argbuff);
+  f = owl_filter_new_fromstring(filtname, argbuff);
 
   /* add it to the global list */
@@ -2825 +2818 @@
   owl_filter *f;
   owl_list *fl;
-  int ret, i, j;
+  int i, j;
   fl=owl_global_get_puntlist(&g);
 
   /* first, create the filter */
-  f=owl_malloc(sizeof(owl_filter));
-
   owl_function_debugmsg("About to filter %s", filter);
-  ret=owl_filter_init_fromstring(f, "punt-filter", filter);
-  if (ret) {
+  f = owl_filter_new_fromstring("punt-filter", filter);
+  if (f == NULL) {
     owl_function_error("Error creating filter for zpunt");
-    owl_filter_free(f);
-    owl_free(f);
     return;
   }
@@ -2847 +2836 @@
       /* if we're punting, then just silently bow out on this duplicate */
       if (direction==0) {
-        owl_filter_free(f);
-        owl_free(f);
+        owl_filter_delete(f);
         return;
       }
@@ -2854 +2842 @@
       /* if we're unpunting, then remove this filter from the puntlist */
       if (direction==1) {
-        owl_filter_free(owl_list_get_element(fl, i));
+        owl_filter_delete(owl_list_get_element(fl, i));
         owl_list_remove_element(fl, i);
-        owl_filter_free(f);
-        owl_free(f);
+        owl_filter_delete(f);
         return;
       }