Changes in filter.c [af1920fd:cdc6ff1]

File:

• filter.c (modified) (3 diffs)

filter.c

@@ -29 +29 @@
   while ( argc>=2 && ( !strcmp(argv[0], "-c") ||
                        !strcmp(argv[0], "-b") ) ) {
-    if (owl_util_string_to_color(argv[1])==-1) {
+    if (owl_util_string_to_color(argv[1])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available, using default.", argv[1]);
     } else {
@@ -212 +212 @@
 
 
-void owl_filter_print(owl_filter *f, char *out)
-{
-  strcpy(out, owl_filter_get_name(f));
-  strcat(out, ": ");
+char* owl_filter_print(owl_filter *f)
+{
+  GString *out = g_string_new("");
 
   if (f->fgcolor!=OWL_COLOR_DEFAULT) {
-    strcat(out, "-c ");
+    g_string_append(out, "-c ");
     if (f->fgcolor < 8) {
-      strcat(out, owl_util_color_to_string(f->fgcolor));
+      g_string_append(out, owl_util_color_to_string(f->fgcolor));
     }
     else {
-      char* c = owl_sprintf("%i",f->fgcolor);
-      strcat(out, c);
-      owl_free(c);
-    }
-    strcat(out, " ");
+      g_string_append_printf(out, "%i",f->fgcolor);
+    }
+    g_string_append(out, " ");
   }
   if (f->bgcolor!=OWL_COLOR_DEFAULT) {
-    strcat(out, "-b ");
+    g_string_append(out, "-b ");
     if (f->bgcolor < 8) {
-      strcat(out, owl_util_color_to_string(f->bgcolor));
+      g_string_append(out, owl_util_color_to_string(f->bgcolor));
     }
     else {
-      char* c = owl_sprintf("%i",f->bgcolor);
-      strcat(out, c);
-      owl_free(c);
-    }
-    strcat(out, " ");
-  }
-  if(!f->root) return;
-  owl_filterelement_print(f->root, out);
-  strcat(out, "\n");
+      g_string_append_printf(out, "%i",f->fgcolor);
+    }
+    g_string_append(out, " ");
+  }
+  if(f->root) {
+    owl_filterelement_print(f->root, out);
+    g_string_append(out, "\n");
+  }
+
+  return g_string_free(out, 0);
 }
 
@@ -249 +247 @@
 int owl_filter_equiv(owl_filter *a, owl_filter *b)
 {
-  char buff[LINE], buff2[LINE];
-
-  owl_filter_print(a, buff);
-  owl_filter_print(b, buff2);
-
-  if (!strcmp(buff, buff2)) return(1);
-  return(0);
+  char *buffa, *buffb;
+  int ret;
+
+  buffa = owl_filter_print(a);
+  buffb = owl_filter_print(b);
+
+  ret = !strcmp(buffa, buffb);
+  ret = ret && !strcmp(owl_filter_get_name(a),
+                       owl_filter_get_name(b));
+
+  owl_free(buffa);
+  owl_free(buffb);
+
+  return ret;
 }