mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 22:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux_joystick.c: remove unnecessary regex matching

Browse Source 
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.
This commit is contained in:
Mike Skec 2022-12-17 16:16:16 +11:00
parent 57cbded076
commit 3687575e8c
No known key found for this signature in database
GPG Key ID: 95948155F73A9179
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/linux_joystick.c
View File

@ -277,12 +277,11 @@ void _glfwDetectJoystickConnectionLinux(void)
while (size > offset) while (size > offset)
{ {
regmatch_t match;
const struct inotify_event* e = (struct inotify_event*) (buffer + offset); const struct inotify_event* e = (struct inotify_event*) (buffer + offset);
offset += sizeof(struct inotify_event) + e->len; 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; continue;
char path[PATH_MAX]; char path[PATH_MAX];
@ -326,7 +325,7 @@ GLFWbool _glfwInitJoysticksLinux(void)
// Continue without device connection notifications if inotify fails // 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"); _glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to compile regex");
return GLFW_FALSE; return GLFW_FALSE;
@ -341,9 +340,7 @@ GLFWbool _glfwInitJoysticksLinux(void)
while ((entry = readdir(dir))) while ((entry = readdir(dir)))
{ {
regmatch_t match; if (regexec(&_glfw.linjs.regex, entry->d_name, 0, NULL, 0) != 0)
if (regexec(&_glfw.linjs.regex, entry->d_name, 1, &match, 0) != 0)
continue; continue;
char path[PATH_MAX]; char path[PATH_MAX];