Changeset 1bd5aa9 for filter.c

Timestamp:

Dec 25, 2013, 11:35:05 AM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

d779a1a (diff), 7dcef03 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 7dcef0312dbb22b5bb46c6e0e72c5508ed26c284 into d779a1aa58104b69d351237882b1b55aac8cf315

File:

• filter.c (modified) (6 diffs)

filter.c

@@ -18 +18 @@
   owl_filter *f;
 
-  f = g_new(owl_filter, 1);
+  f = g_slice_new(owl_filter);
 
   f->name=g_strdup(name);
@@ -69 +69 @@
   if(!argc) return NULL;
 
-  fe = g_new(owl_filterelement, 1);
+  fe = g_slice_new(owl_filterelement);
   owl_filterelement_create(fe);
 
@@ -114 +114 @@
 err:
   owl_filterelement_cleanup(fe);
-  g_free(fe);
+  g_slice_free(owl_filterelement, fe);
   return NULL;
 }
@@ -132 +132 @@
     op2 = owl_filter_parse_primitive_expression(argc-i-1, argv+i+1, &skip);
     if(!op2) goto err;
-    tmp = g_new(owl_filterelement, 1);
+    tmp = g_slice_new(owl_filterelement);
     if(!strcasecmp(argv[i], "and")) {
       owl_filterelement_create_and(tmp, op1, op2);
@@ -152 +152 @@
   if(op1) {
     owl_filterelement_cleanup(op1);
-    g_free(op1);
+    g_slice_free(owl_filterelement, op1);
   }
   return NULL;
@@ -262 +262 @@
   if (f->root) {
     owl_filterelement_cleanup(f->root);
-    g_free(f->root);
+    g_slice_free(owl_filterelement, f->root);
   }
   if (f->name)
     g_free(f->name);
-  g_free(f);
-}
+  g_slice_free(owl_filter, f);
+}