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

Simplify goto flow

Browse Source
This commit is contained in:
Scr3amer 2023-09-04 02:10:50 -04:00 committed by GitHub
parent 8c515ce8ef
commit 31746105e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/win32_monitor.c
View File

@ -70,7 +70,7 @@ static char * getAccurateMonitorName(const WCHAR *deviceName)
{ {
rc = GetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &pathCount, &modeCount); rc = GetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &pathCount, &modeCount);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
goto GET_ACCURATE_MONITOR_NAME_FAILURE; goto EARLY_ABORT_ACCURATE_MONITOR_NAME;
free(paths); free(paths);
free(modes); free(modes);
@ -78,7 +78,7 @@ static char * getAccurateMonitorName(const WCHAR *deviceName)
paths = (DISPLAYCONFIG_PATH_INFO *) malloc(sizeof (DISPLAYCONFIG_PATH_INFO) * pathCount); paths = (DISPLAYCONFIG_PATH_INFO *) malloc(sizeof (DISPLAYCONFIG_PATH_INFO) * pathCount);
modes = (DISPLAYCONFIG_MODE_INFO *) malloc(sizeof (DISPLAYCONFIG_MODE_INFO) * modeCount); modes = (DISPLAYCONFIG_MODE_INFO *) malloc(sizeof (DISPLAYCONFIG_MODE_INFO) * modeCount);
if ((paths == NULL) || (modes == NULL)) if ((paths == NULL) || (modes == NULL))
goto GET_ACCURATE_MONITOR_NAME_FAILURE; goto EARLY_ABORT_ACCURATE_MONITOR_NAME;
rc = QueryDisplayConfig(QDC_ONLY_ACTIVE_PATHS, &pathCount, paths, &modeCount, modes, 0); rc = QueryDisplayConfig(QDC_ONLY_ACTIVE_PATHS, &pathCount, paths, &modeCount, modes, 0);
} while (rc == ERROR_INSUFFICIENT_BUFFER); } while (rc == ERROR_INSUFFICIENT_BUFFER);
@ -122,15 +122,11 @@ static char * getAccurateMonitorName(const WCHAR *deviceName)
} }
} }
// We don't free retval when aborting because currently we goto when retval == NULL
EARLY_ABORT_ACCURATE_MONITOR_NAME:
free(paths); free(paths);
free(modes); free(modes);
return retval; return retval;
GET_ACCURATE_MONITOR_NAME_FAILURE:
free(retval);
free(paths);
free(modes);
return NULL;
} }
// Callback for EnumDisplayMonitors in createMonitor // Callback for EnumDisplayMonitors in createMonitor