From 0c1d121ff222322ccbfb03cdcf8557bec8cf2d33 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 8 Feb 2015 15:05:24 -0800 Subject: [PATCH] Remove various unused variables Unused variables detected by mingw --- deps/glad/src/glad_wgl.c | 4 ++-- libobs/obs-win-crash-handler.c | 3 --- libobs/util/platform-windows.c | 1 - obs/obs-app.cpp | 3 +-- plugins/win-capture/cursor-capture.c | 1 - plugins/win-capture/duplicator-monitor-capture.c | 3 +-- plugins/win-capture/game-capture.c | 3 --- plugins/win-capture/graphics-hook/gl-capture.c | 1 - plugins/win-capture/graphics-hook/graphics-hook.c | 4 ++-- plugins/win-capture/inject-helper/inject-helper.c | 3 +-- plugins/win-capture/monitor-capture.c | 7 ++----- plugins/win-dshow/win-dshow.cpp | 2 -- plugins/win-wasapi/win-wasapi.cpp | 3 +-- 13 files changed, 10 insertions(+), 28 deletions(-) diff --git a/deps/glad/src/glad_wgl.c b/deps/glad/src/glad_wgl.c index 850a7f4fe..b76bbdb58 100644 --- a/deps/glad/src/glad_wgl.c +++ b/deps/glad/src/glad_wgl.c @@ -583,8 +583,8 @@ static void find_extensionsWGL(void) { } static void find_coreWGL(HDC hdc) { - int major = 9; - int minor = 9; + //int major = 9; + //int minor = 9; GLADWGLhdc = hdc; } diff --git a/libobs/obs-win-crash-handler.c b/libobs/obs-win-crash-handler.c index 51f18be09..2b5d6c40e 100644 --- a/libobs/obs-win-crash-handler.c +++ b/libobs/obs-win-crash-handler.c @@ -295,9 +295,6 @@ static inline bool walk_stack(struct exception_handler_data *data, data->process, thread, &trace->frame, &trace->context, NULL, data->sym_function_table_access64, data->sym_get_module_base64, NULL); - - int last_error = GetLastError(); - if (!success) return false; diff --git a/libobs/util/platform-windows.c b/libobs/util/platform-windows.c index 0db7acd1b..514a8141d 100644 --- a/libobs/util/platform-windows.c +++ b/libobs/util/platform-windows.c @@ -338,7 +338,6 @@ int os_glob(const char *pattern, int flags, os_glob_t **pglob) HANDLE handle; WIN32_FIND_DATA wfd; int ret = -1; - os_glob_t *out = NULL; wchar_t *w_path; da_init(files); diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp index 75b5e1606..4d352d282 100644 --- a/obs/obs-app.cpp +++ b/obs/obs-app.cpp @@ -588,7 +588,6 @@ static void main_crash_handler(const char *format, va_list args, void *param) static void load_debug_privilege(void) { const DWORD flags = TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY; - bool success = false; TOKEN_PRIVILEGES tp; HANDLE token; LUID val; @@ -602,7 +601,7 @@ static void load_debug_privilege(void) tp.Privileges[0].Luid = val; tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - success = !!AdjustTokenPrivileges(token, false, &tp, + AdjustTokenPrivileges(token, false, &tp, sizeof(tp), NULL, NULL); } diff --git a/plugins/win-capture/cursor-capture.c b/plugins/win-capture/cursor-capture.c index 735f7b54d..1b740cab6 100644 --- a/plugins/win-capture/cursor-capture.c +++ b/plugins/win-capture/cursor-capture.c @@ -133,7 +133,6 @@ static inline uint8_t *cursor_capture_icon_bitmap(ICONINFO *ii, static inline bool cursor_capture_icon(struct cursor_data *data, HICON icon) { - bool success = false; uint8_t *bitmap; uint32_t height; uint32_t width; diff --git a/plugins/win-capture/duplicator-monitor-capture.c b/plugins/win-capture/duplicator-monitor-capture.c index 546740d00..9bae7b870 100644 --- a/plugins/win-capture/duplicator-monitor-capture.c +++ b/plugins/win-capture/duplicator-monitor-capture.c @@ -271,8 +271,7 @@ static obs_properties_t *duplicator_capture_properties(void *unused) "monitor", TEXT_MONITOR, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT); - obs_property_t *capture_cursor = obs_properties_add_bool(props, - "capture_cursor", TEXT_CAPTURE_CURSOR); + obs_properties_add_bool(props, "capture_cursor", TEXT_CAPTURE_CURSOR); obs_enter_graphics(); diff --git a/plugins/win-capture/game-capture.c b/plugins/win-capture/game-capture.c index 4b7f2a3c5..b591f6c51 100644 --- a/plugins/win-capture/game-capture.c +++ b/plugins/win-capture/game-capture.c @@ -1146,8 +1146,6 @@ static void insert_preserved_val(obs_property_t *p, const char *val) static bool window_changed_callback(obs_properties_t *ppts, obs_property_t *p, obs_data_t *settings) { - const char *active_window = obs_data_get_string(settings, - SETTING_ACTIVE_WINDOW); const char *cur_val; bool match = false; size_t i = 0; @@ -1196,7 +1194,6 @@ static BOOL CALLBACK EnumFirstMonitor(HMONITOR monitor, HDC hdc, static obs_properties_t *game_capture_properties(void *data) { - struct game_capture *gc = data; HMONITOR monitor; uint32_t cx = 1920; uint32_t cy = 1080; diff --git a/plugins/win-capture/graphics-hook/gl-capture.c b/plugins/win-capture/graphics-hook/gl-capture.c index 36761e2b3..724b6baa5 100644 --- a/plugins/win-capture/graphics-hook/gl-capture.c +++ b/plugins/win-capture/graphics-hook/gl-capture.c @@ -697,7 +697,6 @@ static void gl_capture(HDC hdc) { static bool functions_initialized = false; static bool critical_failure = false; - static bool reacquireing = false; if (critical_failure) { return; diff --git a/plugins/win-capture/graphics-hook/graphics-hook.c b/plugins/win-capture/graphics-hook/graphics-hook.c index 8de9dfd97..b61706d59 100644 --- a/plugins/win-capture/graphics-hook/graphics-hook.c +++ b/plugins/win-capture/graphics-hook/graphics-hook.c @@ -274,8 +274,8 @@ static inline bool dxgi_hookable(void) static inline bool attempt_hook(void) { - static bool ddraw_hooked = false; - static bool d3d8_hooked = false; + //static bool ddraw_hooked = false; + //static bool d3d8_hooked = false; static bool d3d9_hooked = false; static bool dxgi_hooked = false; static bool gl_hooked = false; diff --git a/plugins/win-capture/inject-helper/inject-helper.c b/plugins/win-capture/inject-helper/inject-helper.c index 5220e328d..5fa5d2cba 100644 --- a/plugins/win-capture/inject-helper/inject-helper.c +++ b/plugins/win-capture/inject-helper/inject-helper.c @@ -7,7 +7,6 @@ static void load_debug_privilege(void) { const DWORD flags = TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY; - bool success = false; TOKEN_PRIVILEGES tp; HANDLE token; LUID val; @@ -21,7 +20,7 @@ static void load_debug_privilege(void) tp.Privileges[0].Luid = val; tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - success = !!AdjustTokenPrivileges(token, false, &tp, + AdjustTokenPrivileges(token, false, &tp, sizeof(tp), NULL, NULL); } diff --git a/plugins/win-capture/monitor-capture.c b/plugins/win-capture/monitor-capture.c index 919391e39..3b67b9bbd 100644 --- a/plugins/win-capture/monitor-capture.c +++ b/plugins/win-capture/monitor-capture.c @@ -229,11 +229,8 @@ static obs_properties_t *monitor_capture_properties(void *unused) "monitor", TEXT_MONITOR, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT); - obs_property_t *compatmode = obs_properties_add_bool(props, - "compatibility", TEXT_COMPATIBILITY); - - obs_property_t *capture_cursor = obs_properties_add_bool(props, - "capture_cursor", TEXT_CAPTURE_CURSOR); + obs_properties_add_bool(props, "compatibility", TEXT_COMPATIBILITY); + obs_properties_add_bool(props, "capture_cursor", TEXT_CAPTURE_CURSOR); EnumDisplayMonitors(NULL, NULL, enum_monitor_props, (LPARAM)monitors); diff --git a/plugins/win-dshow/win-dshow.cpp b/plugins/win-dshow/win-dshow.cpp index 1ec2b96cc..a04720edb 100644 --- a/plugins/win-dshow/win-dshow.cpp +++ b/plugins/win-dshow/win-dshow.cpp @@ -1399,7 +1399,6 @@ static void UpdateVideoFormats(VideoDevice &device, VideoFormat format_, static bool UpdateFPS(long long interval, obs_property_t *list) { size_t size = obs_property_list_item_count(list); - bool fps_found = false; DStr name; for (size_t i = 0; i < size; i++) { @@ -1411,7 +1410,6 @@ static bool UpdateFPS(long long interval, obs_property_t *list) return false; dstr_cat(name, obs_property_list_item_name(list, i)); - fps_found = true; break; } diff --git a/plugins/win-wasapi/win-wasapi.cpp b/plugins/win-wasapi/win-wasapi.cpp index 86d30aa01..4e0dab2fd 100644 --- a/plugins/win-wasapi/win-wasapi.cpp +++ b/plugins/win-wasapi/win-wasapi.cpp @@ -494,8 +494,7 @@ static obs_properties_t *GetWASAPIProperties(bool input) device.name.c_str(), device.id.c_str()); } - obs_property_t *prop; - prop = obs_properties_add_bool(props, OPT_USE_DEVICE_TIMING, + obs_properties_add_bool(props, OPT_USE_DEVICE_TIMING, obs_module_text("UseDeviceTiming")); return props;