From af3890a4a9cda672196047da967310660fe1dea9 Mon Sep 17 00:00:00 2001 From: Norihiro Kamae Date: Fri, 15 Jul 2022 16:18:37 +0900 Subject: [PATCH] libobs: Cleanup unused-parameters - Add OBS_UNUSED to unused function parameters - Remove unnecessary UNUSED_PARAMETER Also update libobs-opengl/ --- libobs-opengl/gl-egl-common.c | 2 +- libobs-opengl/gl-nix.c | 3 ++- libobs-opengl/gl-subsystem.c | 2 +- libobs-opengl/gl-wayland-egl.c | 6 ++++-- libobs-opengl/gl-x11-egl.c | 1 - libobs/audio-monitoring/osx/coreaudio-output.c | 2 -- libobs/obs-audio-controls.c | 2 -- libobs/obs-hotkey.c | 1 - libobs/obs-nix-wayland.c | 1 - libobs/obs-scene.c | 1 - libobs/util/bmem.c | 4 +++- 11 files changed, 11 insertions(+), 14 deletions(-) diff --git a/libobs-opengl/gl-egl-common.c b/libobs-opengl/gl-egl-common.c index bda4a6883..46892372d 100644 --- a/libobs-opengl/gl-egl-common.c +++ b/libobs-opengl/gl-egl-common.c @@ -178,7 +178,7 @@ create_dmabuf_egl_image(EGLDisplay egl_display, unsigned int width, } struct gs_texture *gl_egl_create_texture_from_eglimage( - EGLDisplay egl_display, uint32_t width, uint32_t height, + EGLDisplay egl_display OBS_UNUSED, uint32_t width, uint32_t height, enum gs_color_format color_format, EGLint target, EGLImage image) { UNUSED_PARAMETER(target); diff --git a/libobs-opengl/gl-nix.c b/libobs-opengl/gl-nix.c index 846524932..dc5a2b52f 100644 --- a/libobs-opengl/gl-nix.c +++ b/libobs-opengl/gl-nix.c @@ -120,7 +120,8 @@ extern void device_present(gs_device_t *device) gl_vtable->device_present(device); } -extern bool device_is_monitor_hdr(gs_device_t *device, void *monitor) +extern bool device_is_monitor_hdr(gs_device_t *device OBS_UNUSED, + void *monitor OBS_UNUSED) { return false; } diff --git a/libobs-opengl/gl-subsystem.c b/libobs-opengl/gl-subsystem.c index d8969b329..0cdd46d08 100644 --- a/libobs-opengl/gl-subsystem.c +++ b/libobs-opengl/gl-subsystem.c @@ -1202,9 +1202,9 @@ void device_flush(gs_device_t *device) glFlush(); #else glFlush(); -#endif UNUSED_PARAMETER(device); +#endif } void device_set_cull_mode(gs_device_t *device, enum gs_cull_mode mode) diff --git a/libobs-opengl/gl-wayland-egl.c b/libobs-opengl/gl-wayland-egl.c index cc15c82ab..3a3e0389b 100644 --- a/libobs-opengl/gl-wayland-egl.c +++ b/libobs-opengl/gl-wayland-egl.c @@ -384,8 +384,10 @@ static bool gl_wayland_egl_device_query_dmabuf_modifiers_for_format( } static struct gs_texture *gl_wayland_egl_device_texture_create_from_pixmap( - gs_device_t *device, uint32_t width, uint32_t height, - enum gs_color_format color_format, uint32_t target, void *pixmap) + gs_device_t *device OBS_UNUSED, uint32_t width OBS_UNUSED, + uint32_t height OBS_UNUSED, + enum gs_color_format color_format OBS_UNUSED, + uint32_t target OBS_UNUSED, void *pixmap OBS_UNUSED) { return NULL; } diff --git a/libobs-opengl/gl-x11-egl.c b/libobs-opengl/gl-x11-egl.c index 3a2e08efd..c3e541afb 100644 --- a/libobs-opengl/gl-x11-egl.c +++ b/libobs-opengl/gl-x11-egl.c @@ -266,7 +266,6 @@ gl_x11_egl_windowinfo_create(const struct gs_init_data *info) static void gl_x11_egl_windowinfo_destroy(struct gl_windowinfo *info) { - UNUSED_PARAMETER(info); bfree(info); } diff --git a/libobs/audio-monitoring/osx/coreaudio-output.c b/libobs/audio-monitoring/osx/coreaudio-output.c index 93f6cf4a1..f464aa6ec 100644 --- a/libobs/audio-monitoring/osx/coreaudio-output.c +++ b/libobs/audio-monitoring/osx/coreaudio-output.c @@ -61,8 +61,6 @@ static void on_audio_playback(void *param, obs_source_t *source, float vol = source->user_volume; uint32_t bytes; - UNUSED_PARAMETER(source); - if (!os_atomic_load_bool(&monitor->active)) { return; } diff --git a/libobs/obs-audio-controls.c b/libobs/obs-audio-controls.c index d561aede1..fb679caed 100644 --- a/libobs/obs-audio-controls.c +++ b/libobs/obs-audio-controls.c @@ -551,8 +551,6 @@ static void volmeter_source_data_received(void *vptr, obs_source_t *source, pthread_mutex_unlock(&volmeter->mutex); signal_levels_updated(volmeter, magnitude, peak, input_peak); - - UNUSED_PARAMETER(source); } obs_fader_t *obs_fader_create(enum obs_fader_type type) diff --git a/libobs/obs-hotkey.c b/libobs/obs-hotkey.c index 72879cb6b..e3d374769 100644 --- a/libobs/obs-hotkey.c +++ b/libobs/obs-hotkey.c @@ -593,7 +593,6 @@ static inline bool find_pair_id(obs_hotkey_pair_id id, size_t *idx) static inline bool pair_pointer_fixup_func(size_t idx, obs_hotkey_pair_t *pair, void *data) { - UNUSED_PARAMETER(idx); UNUSED_PARAMETER(data); if (find_id(pair->id[0], &idx)) diff --git a/libobs/obs-nix-wayland.c b/libobs/obs-nix-wayland.c index 867703871..5ed882bdd 100644 --- a/libobs/obs-nix-wayland.c +++ b/libobs/obs-nix-wayland.c @@ -216,7 +216,6 @@ static void platform_registry_handler(void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version) { - UNUSED_PARAMETER(version); obs_hotkeys_platform_t *plat = (obs_hotkeys_platform_t *)data; if (strcmp(interface, wl_seat_interface.name) == 0) { diff --git a/libobs/obs-scene.c b/libobs/obs-scene.c index 1bf892559..a77ec9799 100644 --- a/libobs/obs-scene.c +++ b/libobs/obs-scene.c @@ -2353,7 +2353,6 @@ bool save_transform_states(obs_scene_t *scene, obs_sceneitem_t *item, obs_data_array_release(nids); } - UNUSED_PARAMETER(scene); return true; } diff --git a/libobs/util/bmem.c b/libobs/util/bmem.c index 4c0a6a120..7ee188a9c 100644 --- a/libobs/util/bmem.c +++ b/libobs/util/bmem.c @@ -162,4 +162,6 @@ void *bmemdup(const void *ptr, size_t size) return out; } -OBS_DEPRECATED void base_set_allocator(struct base_allocator *defs) {} +OBS_DEPRECATED void base_set_allocator(struct base_allocator *defs OBS_UNUSED) +{ +}