From 83f60130703cdc62075c8737dcae531e00b4f341 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Fri, 24 Aug 2018 17:49:15 -0400 Subject: [PATCH] cppcheck: Fix "variable scope can be reduced" warnings in libmyth. Push variable declarations into the nested scope where they are actually used, and often combine this with the initial assignment of the variable. --- mythtv/libs/libmyth/audio/audioconvert.cpp | 2 +- mythtv/libs/libmyth/audio/audiooutput.cpp | 1 + mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 13 +++++-------- mythtv/libs/libmyth/audio/audiooutputbase.cpp | 5 ++--- mythtv/libs/libmyth/audio/audiooutputca.cpp | 3 +-- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/mythtv/libs/libmyth/audio/audioconvert.cpp b/mythtv/libs/libmyth/audio/audioconvert.cpp index d438a653b5a..edb10d0bbec 100644 --- a/mythtv/libs/libmyth/audio/audioconvert.cpp +++ b/mythtv/libs/libmyth/audio/audioconvert.cpp @@ -575,7 +575,6 @@ class AudioConvertInternal AudioConvertInternal(AVSampleFormat in, AVSampleFormat out) : m_in(in), m_out(out) { - char error[AV_ERROR_MAX_STRING_SIZE]; m_swr = swr_alloc_set_opts(NULL, av_get_default_channel_layout(1), m_out, @@ -593,6 +592,7 @@ class AudioConvertInternal int ret = swr_init(m_swr); if (ret < 0) { + char error[AV_ERROR_MAX_STRING_SIZE]; LOG(VB_AUDIO, LOG_ERR, LOC + QString("error initializing resampler context (%1)") .arg(av_make_error_string(error, sizeof(error), ret))); diff --git a/mythtv/libs/libmyth/audio/audiooutput.cpp b/mythtv/libs/libmyth/audio/audiooutput.cpp index 2ff02238275..e7ed98310f6 100644 --- a/mythtv/libs/libmyth/audio/audiooutput.cpp +++ b/mythtv/libs/libmyth/audio/audiooutput.cpp @@ -378,6 +378,7 @@ AudioOutput::AudioDeviceConfig* AudioOutput::GetAudioDeviceConfig( (aosettings.canLPCM() << 0) | (aosettings.canAC3() << 1) | (aosettings.canDTS() << 2); + // cppcheck-suppress variableScope static const char *type_names[] = { "LPCM", "AC3", "DTS" }; if (mask != 0) diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp index 9ce68f112f8..eecc750aa24 100644 --- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp @@ -254,8 +254,6 @@ QByteArray *AudioOutputALSA::GetELD(int card, int device, int subdevice) snd_ctl_elem_value_t *control; snd_ctl_elem_value_alloca(&control); snd_ctl_elem_type_t type; - unsigned int count; - int err; snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_PCM); @@ -290,7 +288,7 @@ QByteArray *AudioOutputALSA::GetELD(int card, int device, int subdevice) snd_hctl_close(hctl); return NULL; } - count = snd_ctl_elem_info_get_count(info); + unsigned int count = snd_ctl_elem_info_get_count(info); type = snd_ctl_elem_info_get_type(info); if (!snd_ctl_elem_info_is_readable(info)) { @@ -550,7 +548,7 @@ void AudioOutputALSA::WriteAudio(uchar *aubuf, int size) { uchar *tmpbuf = aubuf; uint frames = size / output_bytes_per_frame; - int err, lw = 0; + int err; if (pcm_handle == NULL) { @@ -570,7 +568,7 @@ void AudioOutputALSA::WriteAudio(uchar *aubuf, int size) while (frames > 0) { - lw = snd_pcm_writei(pcm_handle, tmpbuf, frames); + int lw = snd_pcm_writei(pcm_handle, tmpbuf, frames); if (lw >= 0) { @@ -993,7 +991,6 @@ QMap *AudioOutputALSA::GetDevices(const char *type) { QMap *alsadevs = new QMap(); void **hints, **n; - char *name, *desc; if (snd_device_name_hint(-1, type, &hints) < 0) return alsadevs; @@ -1001,8 +998,8 @@ QMap *AudioOutputALSA::GetDevices(const char *type) while (*n != NULL) { - name = snd_device_name_get_hint(*n, "NAME"); - desc = snd_device_name_get_hint(*n, "DESC"); + char *name = snd_device_name_get_hint(*n, "NAME"); + char *desc = snd_device_name_get_hint(*n, "DESC"); if (name && desc && strcmp(name, "null")) alsadevs->insert(name, desc); if (name) diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp index d5e05e4fe67..f2f132a6665 100644 --- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp @@ -1305,17 +1305,16 @@ int AudioOutputBase::CopyWithUpmix(char *buffer, int frames, uint &org_waud) int i = 0; len = 0; - int nFrames, bdFrames; while (i < frames) { i += upmixer->putFrames(buffer + i * off, frames - i, source_channels); - nFrames = upmixer->numFrames(); + int nFrames = upmixer->numFrames(); if (!nFrames) continue; len += CheckFreeSpace(nFrames); - bdFrames = (kAudioRingBufferSize - org_waud) / bpf; + int bdFrames = (kAudioRingBufferSize - org_waud) / bpf; if (bdFrames < nFrames) { if ((org_waud % bpf) != 0) diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp index 93068e0b508..b0899c8f5a7 100644 --- a/mythtv/libs/libmyth/audio/audiooutputca.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputca.cpp @@ -195,7 +195,6 @@ AudioOutputSettings* AudioOutputCA::GetOutputSettings(bool digital) AudioOutputSettings *settings = new AudioOutputSettings(); // Seek hardware sample rate available - int rate; int *rates = d->RatesList(d->mDeviceID); if (rates == NULL) @@ -205,7 +204,7 @@ AudioOutputSettings* AudioOutputCA::GetOutputSettings(bool digital) } else { - while ((rate = settings->GetNextRate())) + while ((int rate = settings->GetNextRate())) { int *p_rates = rates; while (*p_rates > 0)