From 01b6d5d2292e5406b2b23a4ead981519930b0779 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Fri, 20 Sep 2013 10:08:56 +0200 Subject: [PATCH] Fixed compiler warnings. --- channels/rdpsnd/client/alsa/rdpsnd_alsa.c | 5 ----- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 3 ++- channels/rdpsnd/client/rdpsnd_main.c | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c index bfb995c2e..3ab97adc3 100644 --- a/channels/rdpsnd/client/alsa/rdpsnd_alsa.c +++ b/channels/rdpsnd/client/alsa/rdpsnd_alsa.c @@ -453,8 +453,6 @@ static void rdpsnd_alsa_set_volume(rdpsndDevicePlugin* device, UINT32 value) long volume_max; long volume_left; long volume_right; - int percent_left; - int percent_right; snd_mixer_elem_t* elem; rdpsndAlsaPlugin* alsa = (rdpsndAlsaPlugin*) device; @@ -464,9 +462,6 @@ static void rdpsnd_alsa_set_volume(rdpsndDevicePlugin* device, UINT32 value) left = (value & 0xFFFF); right = ((value >> 16) & 0xFFFF); - percent_left = (left * 100) / 0xFFFF; - percent_right = (right * 100) / 0xFFFF; - for (elem = snd_mixer_first_elem(alsa->mixer_handle); elem; elem = snd_mixer_elem_next(elem)) { if (snd_mixer_selem_has_playback_volume(elem)) diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 607645d1e..c44d29113 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -548,9 +548,10 @@ static void rdpsnd_pulse_parse_addin_args(rdpsndDevicePlugin* device, ADDIN_ARGV status = CommandLineParseArgumentsA(args->argc, (const char**) args->argv, rdpsnd_pulse_args, flags, pulse, NULL, NULL); + if (status) + return; arg = rdpsnd_pulse_args; - do { if (!(arg->Flags & COMMAND_LINE_VALUE_PRESENT)) diff --git a/channels/rdpsnd/client/rdpsnd_main.c b/channels/rdpsnd/client/rdpsnd_main.c index 613f16003..5fe38457d 100644 --- a/channels/rdpsnd/client/rdpsnd_main.c +++ b/channels/rdpsnd/client/rdpsnd_main.c @@ -594,6 +594,8 @@ static void rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, ADDIN_ARGV* args) status = CommandLineParseArgumentsA(args->argc, (const char**) args->argv, rdpsnd_args, flags, rdpsnd, NULL, NULL); + if (status) + return; arg = rdpsnd_args;