summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-01 03:36:39 +0200
committerJan Ekström <jeebjp@gmail.com>2018-05-03 01:20:01 +0300
commit88498bcc92305dccb8a73104f7996dd4253a0a2d (patch)
tree9dd98351d164a2b24f338a9af6dcff42554d33eb
parent407f5b407a932efead8dc0f7453acbeb9390d11a (diff)
downloadmpv-88498bcc92305dccb8a73104f7996dd4253a0a2d.tar.bz2
mpv-88498bcc92305dccb8a73104f7996dd4253a0a2d.tar.xz
input: rename weirdly named function
-rw-r--r--input/cmd.c2
-rw-r--r--input/cmd.h3
-rw-r--r--input/input.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/input/cmd.c b/input/cmd.c
index 0bab03d1b8..8c15c0109b 100644
--- a/input/cmd.c
+++ b/input/cmd.c
@@ -316,7 +316,7 @@ error:
return NULL;
}
-mp_cmd_t *mp_input_parse_cmd_(struct mp_log *log, bstr str, const char *loc)
+mp_cmd_t *mp_input_parse_cmd_str(struct mp_log *log, bstr str, const char *loc)
{
void *tmp = talloc_new(NULL);
bstr original = str;
diff --git a/input/cmd.h b/input/cmd.h
index 18beca5ee8..a985d0394c 100644
--- a/input/cmd.h
+++ b/input/cmd.h
@@ -124,7 +124,8 @@ void mp_print_cmd_list(struct mp_log *out);
// Parse text and return corresponding struct mp_cmd.
// The location parameter is for error messages.
-struct mp_cmd *mp_input_parse_cmd_(struct mp_log *log, bstr str, const char *loc);
+struct mp_cmd *mp_input_parse_cmd_str(struct mp_log *log, bstr str,
+ const char *loc);
// Similar to mp_input_parse_cmd(), but takes a list of strings instead.
// Also, MP_ON_OSD_AUTO | MP_EXPAND_PROPERTIES are not set by default.
diff --git a/input/input.c b/input/input.c
index 70e94dcc5d..20c39dd4ac 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1450,7 +1450,7 @@ bool mp_input_use_media_keys(struct input_ctx *ictx)
struct mp_cmd *mp_input_parse_cmd(struct input_ctx *ictx, bstr str,
const char *location)
{
- return mp_input_parse_cmd_(ictx->log, str, location);
+ return mp_input_parse_cmd_str(ictx->log, str, location);
}
void mp_input_run_cmd(struct input_ctx *ictx, const char **cmd)
@@ -1603,7 +1603,7 @@ void mp_input_src_feed_cmd_text(struct mp_input_src *src, char *buf, size_t len)
if (term) {
bstr s = {in->cmd_buffer, in->cmd_buffer_size};
s = bstr_strip(s);
- struct mp_cmd *cmd= mp_input_parse_cmd_(src->log, s, "<>");
+ struct mp_cmd *cmd = mp_input_parse_cmd_str(src->log, s, "<>");
if (cmd)
mp_input_queue_cmd(src->input_ctx, cmd);
in->cmd_buffer_size = 0;