From 3687575e8c14ae7136c3c413f61e8ef20b88cc64 Mon Sep 17 00:00:00 2001 From: Mike Skec Date: Sat, 17 Dec 2022 16:16:16 +1100 Subject: [PATCH] linux_joystick.c: remove unnecessary regex matching The regex match results are not needed and are not used anywhere. The regex can be compiled with the REG_NOSUB flag to have the nmatch and pmatch parameters of the regexec calls be ignored. --- src/linux_joystick.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/linux_joystick.c b/src/linux_joystick.c index 26db853e..3326a67d 100644 --- a/src/linux_joystick.c +++ b/src/linux_joystick.c @@ -277,12 +277,11 @@ void _glfwDetectJoystickConnectionLinux(void) while (size > offset) { - regmatch_t match; const struct inotify_event* e = (struct inotify_event*) (buffer + offset); offset += sizeof(struct inotify_event) + e->len; - if (regexec(&_glfw.linjs.regex, e->name, 1, &match, 0) != 0) + if (regexec(&_glfw.linjs.regex, e->name, 0, NULL, 0) != 0) continue; char path[PATH_MAX]; @@ -326,7 +325,7 @@ GLFWbool _glfwInitJoysticksLinux(void) // Continue without device connection notifications if inotify fails - if (regcomp(&_glfw.linjs.regex, "^event[0-9]\\+$", 0) != 0) + if (regcomp(&_glfw.linjs.regex, "^event[0-9]\\+$", REG_NOSUB) != 0) { _glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to compile regex"); return GLFW_FALSE; @@ -341,9 +340,7 @@ GLFWbool _glfwInitJoysticksLinux(void) while ((entry = readdir(dir))) { - regmatch_t match; - - if (regexec(&_glfw.linjs.regex, entry->d_name, 1, &match, 0) != 0) + if (regexec(&_glfw.linjs.regex, entry->d_name, 0, NULL, 0) != 0) continue; char path[PATH_MAX];