From 2f300eb6b58a0fa25c462f51ada3c84fa56304a0 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Sun, 16 Jun 2019 17:14:18 -0700 Subject: [PATCH] Avoid initializer index range This is a GNU C extension, and is not available in ISO C. Instead, just explicitly initialize other indices to -1. Signed-off-by: Michael Forney --- libevdev/make-event-names.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py index 820eb5e..4d9d807 100755 --- a/libevdev/make-event-names.py +++ b/libevdev/make-event-names.py @@ -94,11 +94,13 @@ def print_map(bits): print("#pragma GCC diagnostic ignored \"-Woverride-init\"") print("#endif") print("static const int ev_max[EV_MAX + 1] = {") - print(" [0 ... EV_MAX] = -1,") - for prefix in prefixes: - if prefix in ["BTN_", "EV_", "INPUT_PROP_", "MT_TOOL_"]: - continue - print(" [EV_%s] = %s_MAX," % (prefix[:-1], prefix[:-1])) + for val in range(bits.max_codes["EV_MAX"] + 1): + if val in bits.ev: + prefix = bits.ev[val][3:] + if prefix + "_" in prefixes: + print(" %s_MAX," % prefix) + continue + print(" -1,") print("};") print("#if __clang__") print("#pragma clang diagnostic pop /* \"-Winitializer-overrides\" */") -- 2.34.1