Changeset f1c845b for commands.c

Timestamp:

May 24, 2011, 9:36:44 PM (14 years ago)

Author:

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

Parents:

b848e30 (diff), 697221f (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 697221fc51f0060043c93821f0358317f6bc6ab0 into b848e308e9f8f212ddbf787f08111af994000512

File:

• commands.c (modified) (4 diffs)

commands.c

@@ -281 +281 @@
   OWLCMD_ARGS("punt", owl_command_punt, OWL_CTX_ANY,
               "suppress an arbitrary filter",
-              "punt <filter-text>",
-              "punt <filter-text (multiple words)>\n"
+              "punt <filter-name>\n"
+              "punt <filter-text (multiple words)>",
               "The punt command will suppress messages to the specified\n"
               "filter\n\n"
@@ -289 +289 @@
   OWLCMD_ARGS("unpunt", owl_command_unpunt, OWL_CTX_ANY,
               "remove an entry from the punt list",
-              "unpunt <filter-text>\n"
-              "unpunt <filter-text>\n"
-              "unpunt <number>\n",
+              "unpunt <number>\n"
+              "unpunt <filter-name>\n"
+              "unpunt <filter-text (multiple words)>",
               "The unpunt command will remove an entry from the puntlist.\n"
-              "The first two forms correspond to the first two forms of the :punt\n"
-              "command. The latter allows you to remove a specific entry from the\n"
+              "The last two forms correspond to the two forms of the :punt\n"
+              "command. The first allows you to remove a specific entry from\n"
               "the list (see :show zpunts)\n\n"
               "SEE ALSO:  punt, zpunt, zunpunt, show zpunts\n"),
@@ -2464 +2464 @@
   owl_list * fl;
   owl_filter * f;
-  char * text;
   int i;
 
@@ -2480 +2479 @@
         return;
       } else {
-        owl_function_error("No such filter number: %d", i+1);
+        owl_function_makemsg("No such filter number: %d.", i+1);
       }
     }
-    text = owl_string_build_quoted("filter %q", argv[1]);
-    owl_function_punt(text, unpunt);
-    g_free(text);
+    const char *filter[] = {"filter", argv[1]};
+    owl_function_punt(2, filter, unpunt);
   } else {
-    owl_function_punt(skiptokens(buff, 1), unpunt);
+    /* Pass in argv[1]..argv[argc-1]. */
+    owl_function_punt(argc - 1, argv + 1, unpunt);
   }
 }