Remove several warnings using clang and gcc

MythTV · Dec 16, 2012 · 55591ed · 55591ed
1 parent c07a94c
commit 55591ed
Show file tree

Hide file tree

Showing 30 changed files with 111 additions and 26 deletions.
diff --git a/mythtv/filters/greedyhdeint/greedyh.asm b/mythtv/filters/greedyhdeint/greedyh.asm
@@ -43,7 +43,7 @@ static void FUNCT_NAME(uint8_t *output, int outstride,
 
     int Line;
     long LoopCtr;
-    long oldbx;
+    long oldbx = 0;
     unsigned int Pitch = stride*2;
     int FieldHeight = height / 2;
 

diff --git a/mythtv/filters/yadif/aclib_template.c b/mythtv/filters/yadif/aclib_template.c
@@ -135,7 +135,7 @@ void * RENAME(fast_memcpy)(void * to, const void * from, size_t len)
 	void *retval;
 	size_t i;
 	retval = to;
-	long oldbx;
+	long oldbx = 0;
 
 	(void) oldbx; // stop compiler warning
 #ifdef STATISTIC

diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp
@@ -17,8 +17,6 @@
 #include <AudioUnit/AudioUnit.h>
 #include <AudioToolbox/AudioFormat.h>
 
-using namespace std;
-
 #include "mythcorecontext.h"
 #include "audiooutputca.h"
 #include "config.h"

diff --git a/mythtv/libs/libmyth/audio/audiooutputsettings.cpp b/mythtv/libs/libmyth/audio/audiooutputsettings.cpp
@@ -167,9 +167,9 @@ int AudioOutputSettings::FormatToBits(AudioFormat format)
         case FORMAT_S24:    return 24;
         case FORMAT_S32:
         case FORMAT_FLT:    return 32;
+        case FORMAT_NONE:
+        default:            return -1;
     }
-
-    return -1;
 }
 
 const char* AudioOutputSettings::FormatToString(AudioFormat format)
@@ -182,6 +182,7 @@ const char* AudioOutputSettings::FormatToString(AudioFormat format)
         case FORMAT_S24LSB: return "signed 24 bit LSB";
         case FORMAT_S32:    return "signed 32 bit";
         case FORMAT_FLT:    return "32 bit floating point";
+        case FORMAT_NONE:   return "none";
         default:            return "unknown";
     }
 }
@@ -196,9 +197,9 @@ int AudioOutputSettings::SampleSize(AudioFormat format)
         case FORMAT_S24LSB:
         case FORMAT_S32:
         case FORMAT_FLT:    return 4;
+        case FORMAT_NONE:
+        default:            return 0;
     }
-
-    return 0;
 }
 
 void AudioOutputSettings::AddSupportedChannels(int channels)

diff --git a/mythtv/libs/libmyth/audio/audiooutpututil.cpp b/mythtv/libs/libmyth/audio/audiooutpututil.cpp
@@ -488,9 +488,10 @@ int AudioOutputUtil::toFloat(AudioFormat format, void *out, void *in,
         case FORMAT_FLT:
             memcpy(out, in, bytes);
             return bytes;
+        case FORMAT_NONE:
+        default:
+            return 0;
     }
-
-    return 0;
 }
 
 /**
@@ -516,9 +517,10 @@ int AudioOutputUtil::fromFloat(AudioFormat format, void *out, void *in,
             return fromFloat32(format, (int *)out, (float *)in, bytes >> 2);
         case FORMAT_FLT:
             return fromFloatFLT((float *)out, (float *)in, bytes >> 2);
+        case FORMAT_NONE:
+        default:
+            return 0;
     }
-
-    return 0;
 }
 
 /**

diff --git a/mythtv/libs/libmyth/programtypes.cpp b/mythtv/libs/libmyth/programtypes.cpp
@@ -233,7 +233,7 @@ QString toString(RecStatusType recstatus, RecordingType rectype)
         case rsOtherTuning:
             return QObject::tr("Other Tuning");
         case rsUnknown:
-            break;
+            return QObject::tr("Unknown");
     }
 
     return QObject::tr("Unknown");

diff --git a/mythtv/libs/libmythbase/mthread.cpp b/mythtv/libs/libmythbase/mthread.cpp
@@ -81,7 +81,7 @@ class MThreadInternal : public QThread
     void QThreadRun(void) { QThread::run(); }
     int exec(void)
     {
-        DBPurgeHandler ph();
+        DBPurgeHandler ph;
         return QThread::exec();
     }
 

diff --git a/mythtv/libs/libmythbase/mythmedia.cpp b/mythtv/libs/libmythbase/mythmedia.cpp
@@ -479,6 +479,7 @@ MythMediaStatus MythMediaDevice::setStatus( MythMediaStatus NewStatus,
             case MEDIASTAT_USEABLE:
             case MEDIASTAT_MOUNTED:
             case MEDIASTAT_UNPLUGGED:
+            case MEDIASTAT_UNFORMATTED:
                 // get rid of the compiler warning...
                 break;
         }

diff --git a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp
@@ -921,8 +921,9 @@ QString MythAirplayServer::eventToString(AirplayEvent event)
         case AP_EVENT_PAUSED:  return "paused";
         case AP_EVENT_LOADING: return "loading";
         case AP_EVENT_STOPPED: return "stopped";
+        case AP_EVENT_NONE:    return "none";
+        default:               return "";
     }
-    return "";
 }
 
 void MythAirplayServer::GetPlayerStatus(bool &playing, float &speed,

diff --git a/mythtv/libs/libmythtv/HLS/httplivestream.cpp b/mythtv/libs/libmythtv/HLS/httplivestream.cpp
@@ -91,7 +91,7 @@ class HTTPLiveStreamThread : public QRunnable
 HTTPLiveStream::HTTPLiveStream(QString srcFile, uint16_t width, uint16_t height,
                                uint32_t bitrate, uint32_t abitrate,
                                uint16_t maxSegments, uint16_t segmentSize,
-                               uint32_t aobitrate, uint16_t srate)
+                               uint32_t aobitrate, int32_t srate)
   : m_writing(false),
     m_streamid(-1),              m_sourceFile(srcFile),
     m_sourceWidth(0),            m_sourceHeight(0),

diff --git a/mythtv/libs/libmythtv/HLS/httplivestream.h b/mythtv/libs/libmythtv/HLS/httplivestream.h
@@ -25,7 +25,7 @@ class MTV_PUBLIC HTTPLiveStream
     HTTPLiveStream(QString srcFile, uint16_t width = 640, uint16_t height = 480,
                    uint32_t bitrate = 800000, uint32_t abitrate = 64000,
                    uint16_t maxSegments = 0, uint16_t segmentSize = 10,
-                   uint32_t aobitrate = 32000, uint16_t srate = -1);
+                   uint32_t aobitrate = 32000, int32_t srate = -1);
     HTTPLiveStream(int streamid);
    ~HTTPLiveStream();
 
@@ -106,7 +106,7 @@ class MTV_PUBLIC HTTPLiveStream
     uint32_t    m_bitrate;
     uint32_t    m_audioBitrate;
     uint32_t    m_audioOnlyBitrate;
-    uint16_t    m_sampleRate;
+    int32_t     m_sampleRate;
 
     QDateTime   m_created;
     QDateTime   m_lastModified;

diff --git a/mythtv/libs/libmythtv/avformatwriter.h b/mythtv/libs/libmythtv/avformatwriter.h
@@ -1,6 +1,7 @@
 #ifndef AVFORMATWRITER_H_
 #define AVFORMATWRITER_H_
 
+#include "mythconfig.h"
 #include "filewriterbase.h"
 #include "avfringbuffer.h"
 

diff --git a/mythtv/libs/libmythtv/fourcc.h b/mythtv/libs/libmythtv/fourcc.h
@@ -13,6 +13,8 @@
  * $Id$
  *****************************************************************************/
 
+#include "mythconfig.h"
+
 #ifdef __cplusplus
 extern "C" {
 #include "libavutil/common.h" // for MKTAG

diff --git a/mythtv/libs/libmythtv/mhi.h b/mythtv/libs/libmythtv/mhi.h
@@ -20,6 +20,7 @@ using namespace std;
 #include <QRect>
 
 // MythTV headers
+#include "mythconfig.h"
 #include "../libmythfreemheg/freemheg.h"
 #include "interactivetv.h"
 #include "dsmcc.h"

diff --git a/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.h
@@ -15,6 +15,8 @@
 #define MMX
 #endif
 
+#include "mythconfig.h"
+
 #undef HAVE_AV_CONFIG_H
 extern "C" {
 #include "libavcodec/avcodec.h"

diff --git a/mythtv/libs/libmythtv/recorders/RTjpegN.cpp b/mythtv/libs/libmythtv/recorders/RTjpegN.cpp
@@ -1541,11 +1541,11 @@ void RTjpeg::Idct(uint8_t *odata, int16_t *data, int rskip)
 {
 #ifdef MMX
 
-static mmx_t fix_141            = { q: (long long)0x5a825a825a825a82LL };
-static mmx_t fix_184n261        = { q: (long long)0xcf04cf04cf04cf04LL };
-static mmx_t fix_184            = { q: (long long)0x7641764176417641LL };
-static mmx_t fix_n184           = { q: (long long)0x896f896f896f896fLL };
-static mmx_t fix_108n184        = { q: (long long)0xcf04cf04cf04cf04LL };
+static mmx_t fix_141;         fix_141.q = (long long)0x5a825a825a825a82LL;
+static mmx_t fix_184n261; fix_184n261.q = (long long)0xcf04cf04cf04cf04LL;
+static mmx_t fix_184;         fix_184.q = (long long)0x7641764176417641LL;
+static mmx_t fix_n184;       fix_n184.q = (long long)0x896f896f896f896fLL;
+static mmx_t fix_108n184; fix_108n184.q = (long long)0xcf04cf04cf04cf04LL;
 
   mmx_t *wsptr = (mmx_t *)ws;
   register mmx_t *dataptr = (mmx_t *)odata;
@@ -3096,7 +3096,7 @@ int RTjpeg::bcomp(int16_t *rblock, int16_t *old, mmx_t *mask)
  mmx_t *mold=(mmx_t *)old;
  mmx_t *mblock=(mmx_t *)rblock;
  volatile mmx_t result;
- static mmx_t neg= { uq: (unsigned long long)0xffffffffffffffffULL };
+ static mmx_t neg= { (unsigned long long)0xffffffffffffffffULL };
 
  movq_m2r(*mask, mm7);
  movq_m2r(neg, mm6);

diff --git a/mythtv/libs/libmythtv/tvbrowsehelper.cpp b/mythtv/libs/libmythtv/tvbrowsehelper.cpp
@@ -349,6 +349,10 @@ void TVBrowseHelper::GetNextProgramDB(
         case BROWSE_UP:       chandir = CHANNEL_DIRECTION_UP;       break;
         case BROWSE_DOWN:     chandir = CHANNEL_DIRECTION_DOWN;     break;
         case BROWSE_FAVORITE: chandir = CHANNEL_DIRECTION_FAVORITE; break;
+        case BROWSE_SAME:
+        case BROWSE_LEFT:
+        case BROWSE_RIGHT:
+        case BROWSE_INVALID:
         default: break; // quiet -Wswitch-enum
     }
     if (chandir != -1)

diff --git a/mythtv/libs/libmythui/AppleRemoteListener.cpp b/mythtv/libs/libmythui/AppleRemoteListener.cpp
@@ -56,6 +56,8 @@ void AppleRemoteListener::appleRemoteButton(AppleRemote::Event button,
             break;
         case AppleRemote::ControlSwitched:
             return;
+        case AppleRemote::Undefined:
+            break;
     }
     QKeySequence a(code);
     int keycode = 0;

diff --git a/mythtv/libs/libmythui/mythgenerictree.cpp b/mythtv/libs/libmythui/mythgenerictree.cpp
@@ -91,6 +91,9 @@ class SortableMythGenericTreeList : public QList<MythGenericTree*>
 //             case SORT_ATT_THEN_STRING:
 //                 std::sort(begin(), end(), sortByAttributeThenString);
 //                 break;
+            case SORT_ATTRIBUTE:
+            case SORT_ATT_THEN_STRING:
+                break;
         }
     }
 

diff --git a/mythtv/libs/libmythui/mythuibuttonlist.cpp b/mythtv/libs/libmythui/mythuibuttonlist.cpp
@@ -2085,7 +2085,9 @@ bool MythUIButtonList::MoveDown(MovementUnit unit, uint amount)
                 else if (m_wrapStyle > WrapNone)
                     m_selPosition = 0;
             }
+            break;
 
+        case MoveMid:
             break;
     }
 

diff --git a/mythtv/libs/libmythui/mythuitext.cpp b/mythtv/libs/libmythui/mythuitext.cpp
@@ -594,7 +594,6 @@ bool MythUIText::LayoutParagraphs(const QStringList & paragraphs,
 bool MythUIText::GetNarrowWidth(const QStringList & paragraphs,
                                 const QTextOption & textoption, qreal & width)
 {
-    MythRect textrect(m_Area);
     qreal    height, last_line_width, lines;
     int      best_width, too_narrow, last_width = -1;
     int      num_lines, line_height = 0;
@@ -777,6 +776,8 @@ void MythUIText::FillCutMessage(void)
 
             m_CutMessage = templist.join(" ");
             break;
+            case CaseNormal:
+                break;
         }
 
         QTextOption textoption(static_cast<Qt::Alignment>(m_Justification));
@@ -1130,6 +1131,8 @@ void MythUIText::Pulse(void)
                     ShiftCanvas(0, -1);
             }
             break;
+            case ScrollNone:
+                break;
         }
     }
 }

diff --git a/mythtv/libs/libmythupnp/servicehost.cpp b/mythtv/libs/libmythupnp/servicehost.cpp
@@ -355,6 +355,14 @@ bool ServiceHost::ProcessRequest( HTTPRequest *pRequest )
                     case RequestTypePost:
                         sMethodName = "Put" + sMethodName;
                         break;
+                    case RequestTypeUnknown:
+                    case RequestTypeMSearch:
+                    case RequestTypeSubscribe:
+                    case RequestTypeUnsubscribe:
+                    case RequestTypeNotify:
+                    case RequestTypeResponse:
+                        // silence compiler
+                        break;
                 }
 
                 if (m_Methods.contains(sMethodName))

diff --git a/mythtv/libs/libmythupnp/upnp.cpp b/mythtv/libs/libmythupnp/upnp.cpp
@@ -226,7 +226,7 @@ QString UPnp::GetResultDesc( UPnPResultCode eCode )
         //case UPnPResult_CMGR_AccessDenied             = 705,
         //case UPnPResult_CMGR_InvalidConnectionRef     = 706,
         case UPnPResult_CMGR_NotInNetwork           : return "Not In Network";
-
+        case UPnPResult_MythTV_NoNamespaceGiven:      return "Unknown";
     }
 
     return "Unknown";

diff --git a/mythtv/libs/libmythupnp/upnpcds.cpp b/mythtv/libs/libmythupnp/upnpcds.cpp
@@ -1034,6 +1034,8 @@ UPnpCDSExtensionResults *
             // Items don't have any children.
             break;
         }
+        case CDS_BrowseUnknown:
+            break;
     }
 
     return pResults;

diff --git a/mythtv/programs/mythbackend/mythsettings.cpp b/mythtv/programs/mythbackend/mythsettings.cpp
@@ -181,6 +181,15 @@ QString MythSetting::ToHTML(uint level) const
         case kIPAddress:
             size = 20;
             break;
+        case kCheckBox:
+        case kSelect:
+        case kComboBox:
+        case kTVFormat:
+        case kFrequencyTable:
+        case kLocalIPAddress:
+        case kOther:
+        case kInvalidDataType:
+            break;
     }
 
     switch (dtype)
@@ -295,6 +304,8 @@ QString MythSetting::ToHTML(uint level) const
                         "id=\"%2_default\">%3</div>\r\n")
                 .arg(value).arg(value).arg(default_data);
             break;
+        case kInvalidDataType:
+            break;
     }
 
     ret += indent(level) + "</div>\r\n";

diff --git a/mythtv/programs/mythcommflag/BorderDetector.cpp b/mythtv/programs/mythcommflag/BorderDetector.cpp
@@ -1,5 +1,7 @@
 #include <sys/time.h>
 
+#include "mythconfig.h"
+
 extern "C" {
 #include "libavcodec/avcodec.h"        /* AVPicture */
 }

diff --git a/mythtv/programs/mythcommflag/pgm.cpp b/mythtv/programs/mythcommflag/pgm.cpp
@@ -1,5 +1,7 @@
 #include <climits>
 
+#include "mythconfig.h"
+
 extern "C" {
 #include "libavcodec/avcodec.h"
 }

diff --git a/mythtv/programs/mythfrontend/proglist.cpp b/mythtv/programs/mythfrontend/proglist.cpp
@@ -455,6 +455,8 @@ void ProgLister::ShowChooseViewMenu(void)
                 case plStoredSearch: msg = QString("%1\n%2")
                     .arg(tr("Select a search stored from"))
                     .arg(tr("Custom Record")); break;
+                default: // silence warning
+                    break;
             }
 
             screen = new MythUISearchDialog(
@@ -475,13 +477,21 @@ void ProgLister::ShowChooseViewMenu(void)
                 (m_curView >= 0) ? m_viewList[m_curView] : QString());
             break;
         case plTime:
+        {
             QString message =  tr("Start search from date and time");
             int flags = (MythTimeInputDialog::kDay |
                          MythTimeInputDialog::kHours |
                          MythTimeInputDialog::kFutureDates);
             screen = new MythTimeInputDialog(popupStack, message, flags);
             connect_string = false;
             break;
+        }
+        case plRecordid:
+        case plPreviouslyRecorded:
+        case plUnknown:
+        case plTitle:
+        case plSQLSearch:
+            break;
     }
 
     if (!screen)