Changeset c36f4d0 for functions.c

Timestamp:

Jul 23, 2011, 9:24:37 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

4ebbfbc (diff), c40d11a (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 c40d11a3d527920acd6063b93f1de30d1f668c96 into 4ebbfbc5360fa004637dd101f5a0c833cdccd60a

File:

• functions.c (modified) (7 diffs)

functions.c

@@ -2132 +2132 @@
 
 /* Create a new filter, or replace an existing one
- * with a new definition.
+ * with a new definition. Returns true on success.
  */
-void owl_function_create_filter(int argc, const char *const *argv)
+bool owl_function_create_filter(int argc, const char *const *argv)
 {
   owl_filter *f;
@@ -2142 +2142 @@
   if (argc < 2) {
     owl_function_error("Wrong number of arguments to filter command");
-    return;
+    return false;
   }
 
@@ -2152 +2152 @@
   if (!strcmp(argv[1], "all")) {
     owl_function_error("You may not change the 'all' filter.");
-    return;
+    return false;
   }
 
@@ -2160 +2160 @@
     if (!f) {
       owl_function_error("The filter '%s' does not exist.", argv[1]);
-      return;
+      return false;
     }
     if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available.", argv[3]);
-      return;
+      return false;
     }
     owl_filter_set_fgcolor(f, owl_util_string_to_color(argv[3]));
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-    return;
+    return false;
   }
   if (argc==4 && !strcmp(argv[2], "-b")) {
@@ -2174 +2174 @@
     if (!f) {
       owl_function_error("The filter '%s' does not exist.", argv[1]);
-      return;
+      return false;
     }
     if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available.", argv[3]);
-      return;
+      return false;
     }
     owl_filter_set_bgcolor(f, owl_util_string_to_color(argv[3]));
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-    return;
+    return true;
   }
 
@@ -2189 +2189 @@
   if (f == NULL) {
     owl_function_error("Invalid filter");
-    return;
+    return false;
   }
 
@@ -2210 +2210 @@
   }
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  return true;
 }