[vlc-commits] [Git][videolan/vlc][master] 2 commits: actions: remove unused configuration include

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
7a2fa24a by Alexandre Janniaux at 2024-08-05T06:42:05+00:00
actions: remove unused configuration include

- - - - -
9915f1b5 by Alexandre Janniaux at 2024-08-05T06:42:05+00:00
actions: early return on KEY_UNSET

This also fixes a confusing else\nif.

- - - - -


1 changed file:

- src/misc/actions.c


Changes:

=====================================
src/misc/actions.c
=====================================
@@ -40,7 +40,6 @@
 #include <vlc_common.h>
 #include <vlc_actions.h>
 #include <vlc_charset.h>
-#include "config/configuration.h"
 #include "libvlc.h"
 
 static const struct key_descriptor
@@ -223,9 +222,8 @@ uint_fast32_t vlc_str2keycode (const char *name)
                                         sizeof (s_keys[0]), keystrcmp);
     if (d != NULL)
         code = d->i_code;
-    else
-    if (vlc_towc (name, &code) <= 0)
-        code = KEY_UNSET;
+    else if (vlc_towc (name, &code) <= 0)
+        return KEY_UNSET;
 
     if (code != KEY_UNSET)
         code |= mods;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8851a72b3b81582eb8107026f87c4e3f5190d127...9915f1b5528836ba6eaec7d0e2ecadea7c0a283b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8851a72b3b81582eb8107026f87c4e3f5190d127...9915f1b5528836ba6eaec7d0e2ecadea7c0a283b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance