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

Cleanup

Browse Source 
(cherry picked from commit 2a4dd9c28f)
This commit is contained in:
Camilla Löwy 2023-11-16 23:08:30 +01:00
parent 7c7cc59889
commit 2c09407bff
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/linux_joystick.c
View File

@ -283,9 +283,8 @@ GLFWbool _glfwInitJoysticksLinux(void)
// Continue without device connection notifications if inotify fails // Continue without device connection notifications if inotify fails
_glfw.linjs.regex_compiled = regcomp(&_glfw.linjs.regex, _glfw.linjs.regexCompiled = (regcomp(&_glfw.linjs.regex, "^event[0-9]\\+$", 0) == 0);
"^event[0-9]\\+$", 0) == 0; if (!_glfw.linjs.regexCompiled)
if (!_glfw.linjs.regex_compiled)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to compile regex"); _glfwInputError(GLFW_PLATFORM_ERROR, "Linux: Failed to compile regex");
return GLFW_FALSE; return GLFW_FALSE;
@ -345,7 +344,7 @@ void _glfwTerminateJoysticksLinux(void)
close(_glfw.linjs.inotify); close(_glfw.linjs.inotify);
} }
if (_glfw.linjs.regex_compiled) if (_glfw.linjs.regexCompiled)
regfree(&_glfw.linjs.regex); regfree(&_glfw.linjs.regex);
} }

2
src/linux_joystick.h
View File

@ -53,7 +53,7 @@ typedef struct _GLFWlibraryLinux
int inotify; int inotify;
int watch; int watch;
regex_t regex; regex_t regex;
GLFWbool regex_compiled; GLFWbool regexCompiled;
GLFWbool dropped; GLFWbool dropped;
} _GLFWlibraryLinux; } _GLFWlibraryLinux;