summaryrefslogtreecommitdiffstats
path: root/cmd-link-window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-11-13 19:53:28 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-11-13 19:53:28 +0000
commit76ef8770cd983e7ece581fbcfb3a7ad5e115aae5 (patch)
tree0b0d7847f179c9963b58488f8c1724e64176266e /cmd-link-window.c
parentdafa0f022c573513f949c7c66ae83d063fa9a2ab (diff)
Get rid of the ugly CMD_CHFLAG macro and use a const string (eg "dDU") in the
command entry structs and a couple of functions to check/set the flags.
Diffstat (limited to 'cmd-link-window.c')
-rw-r--r--cmd-link-window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-link-window.c b/cmd-link-window.c
index a0b81dcc..f8da27dd 100644
--- a/cmd-link-window.c
+++ b/cmd-link-window.c
@@ -31,7 +31,7 @@ int cmd_link_window_exec(struct cmd *, struct cmd_ctx *);
const struct cmd_entry cmd_link_window_entry = {
"link-window", "linkw",
"[-dk] " CMD_SRCDST_WINDOW_USAGE,
- 0, CMD_CHFLAG('d')|CMD_CHFLAG('k'),
+ 0, "dk",
cmd_srcdst_init,
cmd_srcdst_parse,
cmd_link_window_exec,
@@ -53,8 +53,8 @@ cmd_link_window_exec(struct cmd *self, struct cmd_ctx *ctx)
if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2)
return (-1);
- kflag = data->chflags & CMD_CHFLAG('k');
- dflag = data->chflags & CMD_CHFLAG('d');
+ kflag = cmd_check_flag(data->chflags, 'k');
+ dflag = cmd_check_flag(data->chflags, 'd');
if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) {
ctx->error(ctx, "can't link window: %s", cause);
xfree(cause);