diff options
| author | wm4 <wm4@nowhere> | 2019-11-22 18:21:33 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-11-23 01:18:49 +0100 |
| commit | 6e0e39b79f1a024fb8dd98101c5fc63a8ec0d8ed (patch) | |
| tree | a3debde472a6c400ae1bec940e2a8dee8753323f /input/input.c | |
| parent | dbb5dd7c33e8520ddec5eafc1118f66f854114af (diff) | |
| download | mpv-6e0e39b79f1a024fb8dd98101c5fc63a8ec0d8ed.tar.bz2 mpv-6e0e39b79f1a024fb8dd98101c5fc63a8ec0d8ed.tar.xz | |
input: change mp_cmd.original from bstr to cstr
No reason to have this as bstr, just makes everything more complex.
Also clear mp_cmd.sender when it's copied. Otherwise it would be a
dangling pointer. Apparently it's never set to non-NULL in this
situation, but this is cleaner anyway.
Diffstat (limited to 'input/input.c')
| -rw-r--r-- | input/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/input/input.c b/input/input.c index 89c2571d2b..a9ee42338e 100644 --- a/input/input.c +++ b/input/input.c @@ -282,8 +282,8 @@ static void append_bind_info(struct input_ctx *ictx, char **pmsg, char *msg = *pmsg; struct mp_cmd *cmd = mp_input_parse_cmd(ictx, bstr0(bind->cmd), bind->location); - bstr stripped = cmd ? cmd->original : bstr0(bind->cmd); - msg = talloc_asprintf_append(msg, " '%.*s'", BSTR_P(stripped)); + char *stripped = cmd ? cmd->original : bind->cmd; + msg = talloc_asprintf_append(msg, " '%s'", stripped); if (!cmd) msg = talloc_asprintf_append(msg, " (invalid)"); if (strcmp(bind->owner->section, "default") != 0) |