diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-11-13 19:53:28 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-11-13 19:53:28 +0000 |
| commit | 76ef8770cd983e7ece581fbcfb3a7ad5e115aae5 (patch) | |
| tree | 0b0d7847f179c9963b58488f8c1724e64176266e /cmd-paste-buffer.c | |
| parent | dafa0f022c573513f949c7c66ae83d063fa9a2ab (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-paste-buffer.c')
| -rw-r--r-- | cmd-paste-buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c index e8e638ef..11f70f1f 100644 --- a/cmd-paste-buffer.c +++ b/cmd-paste-buffer.c @@ -32,7 +32,7 @@ void cmd_paste_buffer_lf2cr(struct window_pane *, const char *, size_t); const struct cmd_entry cmd_paste_buffer_entry = { "paste-buffer", "pasteb", "[-dr] " CMD_BUFFER_WINDOW_USAGE, - 0, CMD_CHFLAG('d')|CMD_CHFLAG('r'), + 0, "dr", cmd_buffer_init, cmd_buffer_parse, cmd_paste_buffer_exec, @@ -64,14 +64,14 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) if (pb != NULL && *pb->data != '\0') { /* -r means raw data without LF->CR conversion. */ - if (data->chflags & CMD_CHFLAG('r')) + if (cmd_check_flag(data->chflags, 'r')) bufferevent_write(wp->event, pb->data, pb->size); else cmd_paste_buffer_lf2cr(wp, pb->data, pb->size); } /* Delete the buffer if -d. */ - if (data->chflags & CMD_CHFLAG('d')) { + if (cmd_check_flag(data->chflags, 'd')) { if (data->buffer == -1) paste_free_top(&s->buffers); else |