Changeset 01dcae5 for filter.c

Timestamp:

Mar 29, 2009, 2:43:40 PM (16 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

owl

Children:

395b32e

Parents:

3674002

Message:

sprintf fixes for owl_filter_print, owl_function_printallvars, owl_function_show_filter
        owl_function_show_zpunts, owl_function_zpunt
adopt ^(un)*%s(\\.d) style regex for punting

File:

• filter.c (modified) (3 diffs)

filter.c

@@ -476 +476 @@
 }
 
-void owl_filter_print(owl_filter *f, char *out)
+char *owl_filter_print(owl_filter *f)
 {
   int i, j;
   owl_filterelement *fe;
-  char *tmp;
-
-  strcpy(out, owl_filter_get_name(f));
-  strcat(out, ": ");
+  GString *out = g_string_new("");
 
   if (f->color!=OWL_COLOR_DEFAULT) {
-    strcat(out, "-c ");
-    strcat(out, owl_util_color_to_string(f->color));
-    strcat(out, " ");
+    g_string_append(out, "-c ");
+    if (f->color < 8) {
+      g_string_append(out, owl_util_color_to_string(f->color));
+    } else {
+      g_string_append_printf(out, "%i",f->color);
+    }
+    g_string_append(out, " ");
   }
 
@@ -494 +495 @@
   for (i=0; i<j; i++) {
     fe=owl_list_get_element(&(f->fes), i);
-    tmp=owl_filterelement_to_string(fe);
-    strcat(out, tmp);
-    owl_free(tmp);
-  }
-  strcat(out, "\n");
+    g_string_append(out, owl_filterelement_to_string(fe));
+  }
+
+  return g_string_free(out, 0);
 }
 
@@ -504 +504 @@
 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;
 }