tidy: Remove redundant control flow statements.

Clang-tidy pointed out where functions that don't return a value end with a 'return' statement. Changes made by the clang-tidy program. These problems were pointed out by clang-tidy's "redundant control flow" check. https://clang.llvm.org/extra/clang-tidy/checks/readability-redundant-control-flow.html
MythTV · Mar 20, 2019 · 5eabd02 · 5eabd02
1 parent 2c901c4
commit 5eabd02
Show file tree

Hide file tree

Showing 29 changed files with 5 additions and 54 deletions.
diff --git a/mythplugins/mythgallery/mythgallery/glsingleview.cpp b/mythplugins/mythgallery/mythgallery/glsingleview.cpp
@@ -728,7 +728,6 @@ void GLSingleView::EffectNone(void)
     paintTexture();
     m_effect_running = false;
     m_slideshow_frame_delay_state = -1;
-    return;
 }
 
 void GLSingleView::EffectBlend(void)

diff --git a/mythplugins/mythgallery/mythgallery/singleview.cpp b/mythplugins/mythgallery/mythgallery/singleview.cpp
@@ -767,7 +767,6 @@ void SingleView::EffectNone(void)
     m_effect_running = false;
     m_slideshow_frame_delay_state = -1;
     update();
-    return;
 }
 
 void SingleView::EffectChessboard(void)
@@ -1351,7 +1350,6 @@ void SingleView::EffectNoise(void)
     m_slideshow_frame_delay_state = -1;
     m_effect_running = false;
     update();
-    return;
 }
 
 void SingleView::SlideTimeout(void)

diff --git a/mythplugins/mythmusic/mythmusic/visualize.cpp b/mythplugins/mythmusic/mythmusic/visualize.cpp
@@ -946,8 +946,6 @@ void Piano::zero_analysis(void)
         m_piano_data[key].samples_processed = 0;
     }
     m_offset_processed = 0;
-
-    return;
 }
 
 void Piano::resize(const QSize &newsize)
@@ -1031,8 +1029,6 @@ void Piano::resize(const QSize &newsize)
     {
         m_magnitude[key] = 0.0;
     }
-
-    return;
 }
 
 unsigned long Piano::getDesiredSamples(void)

diff --git a/mythplugins/mythweather/mythweather/sourceManager.cpp b/mythplugins/mythweather/mythweather/sourceManager.cpp
@@ -394,6 +394,4 @@ void SourceManager::recurseDirs( QDir dir )
             }
         }
     }
-
-    return;
 }
diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp
@@ -561,7 +561,7 @@ void AudioOutputJACK::WriteAudio(unsigned char *aubuf, int size)
 {
     (void)aubuf;
     (void)size;
-    return;     // unneeded and unused in JACK
+    // unneeded and unused in JACK
 }
 
 /* **********************************************

diff --git a/mythtv/libs/libmyth/audio/audiooutputnull.h b/mythtv/libs/libmyth/audio/audiooutputnull.h
@@ -32,7 +32,7 @@ class AudioOutputNULL : public AudioOutputBase
     int GetVolumeChannel(int /* channel */) const override // VolumeBase
         { return 100; }
     void SetVolumeChannel(int /* channel */, int /* volume */) override // VolumeBase
-        {return;}
+        {}
 
     int readOutputData(unsigned char *read_buffer, int max_length) override; // AudioOutputBase
 

diff --git a/mythtv/libs/libmythbase/lcddevice.cpp b/mythtv/libs/libmythbase/lcddevice.cpp
@@ -538,7 +538,6 @@ void LCD::setupLEDs(int(*LedMaskFunc)(void))
 void LCD::outputLEDs()
 {
     /* now implemented elsewhere for advanced icon control */
-    return;
 #if 0
     if (!lcd_ready)
         return;

diff --git a/mythtv/libs/libmythbase/mythlocale.cpp b/mythtv/libs/libmythbase/mythlocale.cpp
@@ -201,7 +201,6 @@ void MythLocale::ResetToStandardDefaults(void)
     // TODO Not implemented yet, delete everything in m_globalSettings
     //      from the database then let the standard defaults populate them
     //      again. Used if the user wants to revert the changes
-    return;
 }
 
 QString MythLocale::GetLocaleSetting(const QString &key)

diff --git a/mythtv/libs/libmythbase/mythsocket.cpp b/mythtv/libs/libmythbase/mythsocket.cpp
@@ -795,7 +795,6 @@ void MythSocket::WriteStringListReal(const QStringList *list, bool *ret)
     m_tcpSocket->flush();
 
     *ret = true;
-    return;
 }
 
 void MythSocket::ReadStringListReal(

diff --git a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp
@@ -501,7 +501,6 @@ void MythAirplayServer::Start(void)
         m_serviceRefresh->start(2000);
     }
     m_valid = true;
-    return;
 }
 
 void MythAirplayServer::timeout(void)

diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp
@@ -1756,7 +1756,6 @@ void MythRAOPConnection::newEventClient(QTcpSocket *client)
 
     m_eventClients.append(client);
     connect(client, SIGNAL(disconnected()), this, SLOT(deleteEventClient()));
-    return;
 }
 
 void MythRAOPConnection::deleteEventClient(void)

diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp
@@ -143,7 +143,6 @@ void MythRAOPDevice::Start(void)
     }
 
     m_valid = true;
-    return;
 }
 
 void MythRAOPDevice::Stop(void)

diff --git a/mythtv/libs/libmythtv/Bluray/mythbdplayer.h b/mythtv/libs/libmythtv/Bluray/mythbdplayer.h
@@ -65,7 +65,7 @@ class MythBDPlayer : public MythPlayer
     // Disable screen grabs for Bluray
     void SeekForScreenGrab(uint64_t &/*number*/, uint64_t /*frameNum*/,
                            bool /*absolute*/) override // MythPlayer
-        { return; }
+        {}
 
   private:
     void    DisplayMenu(void);

diff --git a/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp
@@ -588,7 +588,6 @@ class HLSStream
                 break;
             }
         }
-        return;
     }
 
     void RemoveSegment(int segnum, bool willdelete = true)
@@ -601,8 +600,8 @@ class HLSStream
             delete segment;
         }
         m_segments.removeAt(segnum);
-        return;
     }
+
     void RemoveListSegments(QMap<HLSSegment*,bool> &table)
     {
         QMap<HLSSegment*,bool>::iterator it;

diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -2798,8 +2798,8 @@ bool AvFormatDecoder::DoRewindSeek(long long desiredFrame)
 void AvFormatDecoder::DoFastForwardSeek(long long desiredFrame, bool &needflush)
 {
     DecoderBase::DoFastForwardSeek(desiredFrame, needflush);
-    return;
 }
+
 ///Returns TeleText language
 int AvFormatDecoder::GetTeletextLanguage(uint lang_idx) const
 {

diff --git a/mythtv/libs/libmythtv/dsmcc.cpp b/mythtv/libs/libmythtv/dsmcc.cpp
@@ -302,7 +302,6 @@ void Dsmcc::ProcessDownloadInfoIndication(const unsigned char *data,
     dii.m_private_data_len = (data[off] << 8) | data[off + 1];
 
     car->AddModuleInfo(&dii, this, streamTag);
-    return;
 }
 
 // DSI or DII message.
@@ -435,8 +434,6 @@ void Dsmcc::ProcessSectionData(const unsigned char *data, int length)
         LOG(VB_DSMCC, LOG_WARNING, QString("[dsmcc] Data Block ModID %1 Pos %2"
             " unknown carousel %3")
             .arg(ddb.m_module_id).arg(ddb.m_block_number).arg(download_id));
-
-    return;
 }
 
 void Dsmcc::ProcessSectionDesc(const unsigned char *data, int length)

diff --git a/mythtv/libs/libmythtv/eitcache.cpp b/mythtv/libs/libmythtv/eitcache.cpp
@@ -115,8 +115,6 @@ static void delete_in_db(uint endtime)
 
     if (!query.exec())
         MythDB::DBError("Error deleting old eitcache entries.", query);
-
-    return;
 }
 
 

diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -6124,7 +6124,6 @@ void MythPlayer::syncWithAudioStretch()
             .arg((disable_passthrough) ? "disable" : "allow"));
         SetDisablePassThrough(disable_passthrough);
     }
-    return;
 }
 
 void MythPlayer::SetDisablePassThrough(bool disabled)

diff --git a/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp
@@ -1906,7 +1906,6 @@ void NuppelVideoRecorder::BufferIt(unsigned char *buf, int len, bool forcekey)
     if (m_act_video_buffer >= m_video_buffer_count)
         m_act_video_buffer = 0; // cycle to begin of buffer
     videobuffer[act]->freeToEncode = 1; // set last to prevent race
-    return;
 }
 
 inline void NuppelVideoRecorder::WriteFrameheader(rtframeheader *fh)

diff --git a/mythtv/libs/libmythtv/recorders/firewirerecorder.cpp b/mythtv/libs/libmythtv/recorders/firewirerecorder.cpp
@@ -139,8 +139,6 @@ void FirewireRecorder::AddData(const unsigned char *data, uint len)
     }
 
     m_buffer.erase(m_buffer.begin(), m_buffer.begin() + sync_at);
-
-    return;
 }
 
 bool FirewireRecorder::ProcessTSPacket(const TSPacket &tspacket)

diff --git a/mythtv/libs/libmythtv/recorders/vbitext/vbi.c b/mythtv/libs/libmythtv/recorders/vbitext/vbi.c
@@ -468,7 +468,6 @@ vbi_del_handler(struct vbi *vbi, void *handler, void *data)
            dl_remove(cl->node);
            break;
        }
-    return;
 }
 
 #ifdef USING_V4L2

diff --git a/mythtv/libs/libmythtv/videobuffers.cpp b/mythtv/libs/libmythtv/videobuffers.cpp
@@ -495,8 +495,6 @@ void VideoBuffers::Enqueue(BufferType type, VideoFrame *frame)
     q->remove(frame);
     q->enqueue(frame);
     m_globalLock.unlock();
-
-    return;
 }
 
 void VideoBuffers::Remove(BufferType type, VideoFrame *frame)

diff --git a/mythtv/libs/libmythtv/visualisations/goom/zoom_filter_xmmx.c b/mythtv/libs/libmythtv/visualisations/goom/zoom_filter_xmmx.c
@@ -263,6 +263,5 @@ void zoom_filter_xmmx (int prevX, int prevY,
     (void) expix1;    (void) expix2;
     (void) brutS;     (void) brutD;
     (void) buffratio; (void) precalCoef;
-	return;
 }
 #endif
diff --git a/mythtv/libs/libmythui/mythuiimage.cpp b/mythtv/libs/libmythui/mythuiimage.cpp
@@ -915,7 +915,6 @@ void MythUIImage::ForceSize(const QSize &size)
     SetSize(m_imageProperties.m_forceSize);
 
     Load();
-    return;
 }
 
 /**

diff --git a/mythtv/libs/libmythui/mythuitextedit.cpp b/mythtv/libs/libmythui/mythuitextedit.cpp
@@ -422,8 +422,6 @@ static void LoadDeadKeys(QMap<QPair<int, int>, int> &map)
 
     map[keyCombo(Qt::Key_Dead_Acute,      Qt::Key_Y)] = Qt::Key_Yacute;
     map[keyCombo(Qt::Key_Dead_Diaeresis,  Qt::Key_Y)] = Qt::Key_ydiaeresis;
-
-    return;
 }
 
 bool MythUITextEdit::keyPressEvent(QKeyEvent *event)

diff --git a/mythtv/libs/libmythui/mythuitype.cpp b/mythtv/libs/libmythui/mythuitype.cpp
@@ -975,7 +975,6 @@ bool MythUIType::keyPressEvent(QKeyEvent * /*event*/)
 
 void MythUIType::customEvent(QEvent * /*event*/)
 {
-    return;
 }
 
 /** \brief Mouse click/movement handler, receives mouse gesture events from the
@@ -994,7 +993,6 @@ bool MythUIType::gestureEvent(MythGestureEvent * /*event*/)
  */
 void MythUIType::mediaEvent(MythMediaEvent * /*event*/)
 {
-    return;
 }
 
 void MythUIType::LoseFocus(void)

diff --git a/mythtv/libs/libmythupnp/msocketdevice_unix.cpp b/mythtv/libs/libmythupnp/msocketdevice_unix.cpp
@@ -116,8 +116,6 @@ static inline void qt_socket_getportaddr(struct sockaddr *sa,
     *port = ntohs(sa4->sin_port);
 
     *addr = QHostAddress(ntohl(sa4->sin_addr.s_addr));
-
-    return;
 }
 
 // internal

diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
@@ -2821,8 +2821,6 @@ void MainServer::HandleCheckRecordingActive(QStringList &slist,
     QStringList outputlist( QString::number(result) );
     if (pbssock)
         SendResponse(pbssock, outputlist);
-
-    return;
 }
 
 void MainServer::HandleStopRecording(QStringList &slist, PlaybackSock *pbs)
@@ -5625,8 +5623,6 @@ void MainServer::HandleCutMapQuery(const QString &chanid,
 
     if (pbssock)
         SendResponse(pbssock, retlist);
-
-    return;
 }
 
 void MainServer::HandleCommBreakQuery(const QString &chanid,
@@ -5688,8 +5684,6 @@ void MainServer::HandleBookmarkQuery(const QString &chanid,
 
     if (pbssock)
         SendResponse(pbssock, retlist);
-
-    return;
 }
 
 
@@ -5730,8 +5724,6 @@ void MainServer::HandleSetBookmark(QStringList &tokens,
 
     if (pbssock)
         SendResponse(pbssock, retlist);
-
-    return;
 }
 
 void MainServer::HandleSettingQuery(QStringList &tokens, PlaybackSock *pbs)
@@ -5752,8 +5744,6 @@ void MainServer::HandleSettingQuery(QStringList &tokens, PlaybackSock *pbs)
     retlist << retvalue;
     if (pbssock)
         SendResponse(pbssock, retlist);
-
-    return;
 }
 
 void MainServer::HandleDownloadFile(const QStringList &command,
@@ -5850,8 +5840,6 @@ void MainServer::HandleSetSetting(QStringList &tokens,
 
     if (pbssock)
         SendResponse(pbssock, retlist);
-
-    return;
 }
 
 void MainServer::HandleScanVideos(PlaybackSock *pbs)

diff --git a/mythtv/programs/mythtranscode/external/replex/pes.c b/mythtv/programs/mythtranscode/external/replex/pes.c
@@ -392,7 +392,6 @@ void get_pes (pes_in_t *p, uint8_t *buf, int count, void (*func)(pes_in_t *p))
 			}
 		} 
 	} while(!done);
-	return;
 }