From a19988005750f56254977f55bd3d11e944853176 Mon Sep 17 00:00:00 2001 From: Martin Pieuchot Date: Tue, 11 Aug 2015 12:37:51 +0200 Subject: [PATCH] Rename a local variable to not shadow the BSD strmode(3) function. Signed-off-by: Martin Pieuchot Signed-off-by: Peter Hutterer --- src/xf86libinput.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/xf86libinput.c b/src/xf86libinput.c index 49f73c9..f4f0688 100644 --- a/src/xf86libinput.c +++ b/src/xf86libinput.c @@ -1131,28 +1131,28 @@ static inline enum libinput_config_send_events_mode xf86libinput_parse_sendevents_option(InputInfoPtr pInfo, struct libinput_device *device) { - char *strmode; + char *modestr; enum libinput_config_send_events_mode mode; if (libinput_device_config_send_events_get_modes(device) == LIBINPUT_CONFIG_SEND_EVENTS_ENABLED) return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED; mode = libinput_device_config_send_events_get_mode(device); - strmode = xf86SetStrOption(pInfo->options, + modestr = xf86SetStrOption(pInfo->options, "SendEventsMode", NULL); - if (strmode) { - if (strcmp(strmode, "enabled") == 0) + if (modestr) { + if (strcmp(modestr, "enabled") == 0) mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED; - else if (strcmp(strmode, "disabled") == 0) + else if (strcmp(modestr, "disabled") == 0) mode = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED; - else if (strcmp(strmode, "disabled-on-external-mouse") == 0) + else if (strcmp(modestr, "disabled-on-external-mouse") == 0) mode = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE; else xf86IDrvMsg(pInfo, X_ERROR, "Invalid SendeventsMode: %s\n", - strmode); - free(strmode); + modestr); + free(modestr); } if (libinput_device_config_send_events_set_mode(device, mode) !=