From 31ef07ead717206366352bbad5c69aee72903ca9 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Wed, 11 Sep 2024 20:34:37 +0200 Subject: [PATCH] [warnings] fix tautological unsigned zero compare --- channels/audin/client/alsa/audin_alsa.c | 5 +++-- channels/rdpsnd/client/oss/rdpsnd_oss.c | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/channels/audin/client/alsa/audin_alsa.c b/channels/audin/client/alsa/audin_alsa.c index f666d6457..adf3ddbc8 100644 --- a/channels/audin/client/alsa/audin_alsa.c +++ b/channels/audin/client/alsa/audin_alsa.c @@ -128,9 +128,10 @@ static DWORD WINAPI audin_alsa_thread_func(LPVOID arg) DWORD status = 0; WLog_Print(alsa->log, WLOG_DEBUG, "in"); - if ((error = snd_pcm_open(&capture_handle, alsa->device_name, SND_PCM_STREAM_CAPTURE, 0)) < 0) + const int rc = snd_pcm_open(&capture_handle, alsa->device_name, SND_PCM_STREAM_CAPTURE, 0); + if (rc < 0) { - WLog_Print(alsa->log, WLOG_ERROR, "snd_pcm_open (%s)", snd_strerror(error)); + WLog_Print(alsa->log, WLOG_ERROR, "snd_pcm_open (%s)", snd_strerror(rc)); error = CHANNEL_RC_INITIALIZATION_ERROR; goto out; } diff --git a/channels/rdpsnd/client/oss/rdpsnd_oss.c b/channels/rdpsnd/client/oss/rdpsnd_oss.c index a77da51a3..a23849b72 100644 --- a/channels/rdpsnd/client/oss/rdpsnd_oss.c +++ b/channels/rdpsnd/client/oss/rdpsnd_oss.c @@ -330,14 +330,10 @@ static BOOL rdpsnd_oss_set_volume(rdpsndDevicePlugin* device, UINT32 value) unsigned left = (((value & 0xFFFF) * 100) / 0xFFFF); unsigned right = ((((value >> 16) & 0xFFFF) * 100) / 0xFFFF); - if (left < 0) - left = 0; - else if (left > 100) + if (left > 100) left = 100; - if (right < 0) - right = 0; - else if (right > 100) + if (right > 100) right = 100; left |= (right << 8);