Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / config / keys.c

diff --git a/src/config/keys.c b/src/config/keys.c
index d7687c4d6dc5bc3b4087ad5fcd30bcc94b704710..637d4b1445f83eff1b9ebfe0c5ca657c42ecfb15 100644 (file)
--- a/src/config/keys.c
+++ b/src/config/keys.c
@@ -53,12 +53,15 @@ enum { vlc_num_modifiers=sizeof(vlc_modifiers)
 static const struct key_descriptor_s vlc_keys[] =
 {
     { "Unset", KEY_UNSET },
+    { "Backspace", KEY_BACKSPACE },
+    { "Tab", KEY_TAB },
+    { "Enter", KEY_ENTER },
+    { "Esc", KEY_ESC },
     { "Space", ' ' },
     { "Left", KEY_LEFT },
     { "Right", KEY_RIGHT },
     { "Up", KEY_UP },
     { "Down", KEY_DOWN },
-    { "Enter", KEY_ENTER },
     { "F1", KEY_F1 },
     { "F2", KEY_F2 },
     { "F3", KEY_F3 },
@@ -76,11 +79,8 @@ static const struct key_descriptor_s vlc_keys[] =
     { "Insert", KEY_INSERT },
     { "Delete", KEY_DELETE },
     { "Menu", KEY_MENU },
-    { "Esc", KEY_ESC },
     { "Page Up", KEY_PAGEUP },
     { "Page Down", KEY_PAGEDOWN },
-    { "Tab", KEY_TAB },
-    { "Backspace", KEY_BACKSPACE },
     { "Browser Back", KEY_BROWSER_BACK },
     { "Browser Forward", KEY_BROWSER_FORWARD },
     { "Browser Refresh", KEY_BROWSER_REFRESH },
@@ -201,10 +201,9 @@ uint_fast32_t ConfigStringToKey (const char *name)
 {
     uint_fast32_t mods = 0;
 
-    const char *psz_parser = name;
     for (;;)
     {
-        psz_parser = strchr (psz_parser, '-');
+        const char *psz_parser = strchr (name, '-');
         if (psz_parser == NULL || psz_parser == name)
             break;