summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-07-28 23:47:42 +0200
committerwm4 <wm4@mplayer2.org>2012-07-28 23:47:42 +0200
commit08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e (patch)
treee6a6c3a2042231651ec2f622e312657da900280b /input
parentca0979a5db442ae212c92a34dcbd97101eb5e51c (diff)
downloadmpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.bz2
mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.xz
bstr: rename bstr() function to bstr0(), and typedef bstr to struct bstr
Replace all uses of bstr() with bstr0(). Also remove the ridiculous C++ workaround.
Diffstat (limited to 'input')
-rw-r--r--input/input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/input/input.c b/input/input.c
index 014216e093..dbc29d964f 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1546,7 +1546,7 @@ int mp_input_get_key_from_name(const char *name)
const char *p;
while ((p = strchr(name, '+'))) {
for (struct key_name *m = modifier_names; m->name; m++)
- if (!bstrcasecmp(bstr(m->name),
+ if (!bstrcasecmp(bstr0(m->name),
(struct bstr){(char *)name, p - name})) {
modifiers |= m->key;
goto found;
@@ -1558,7 +1558,7 @@ found:
name = p + 1;
}
- struct bstr bname = bstr(name);
+ struct bstr bname = bstr0(name);
struct bstr rest;
int code = bstr_decode_utf8(bname, &rest);