Ticket #5777: libs_libmythdb-krazy2-remove-null.patch

mythtv/libs/libmythdb/compat.h

@@ -100 +100 @@
     /*
     // windows seems to have 1us-resolution timers,
     // however this produces the same results as Sleep
-    HANDLE hTimer = ::CreateWaitableTimer(NULL, TRUE, NULL);
+    HANDLE hTimer = ::CreateWaitableTimer(0, TRUE, 0);
     if (hTimer) {
         LARGE_INTEGER li;
         li.QuadPart = -((int)timeout * 10);
-        if (SetWaitableTimer(hTimer, &li, 0, NULL, 0, FALSE)) {
+        if (SetWaitableTimer(hTimer, &li, 0, 0, 0, FALSE)) {
             DWORD res = WaitForSingleObject(hTimer, (timeout / 1000 + 1));
             if (res == WAIT_TIMEOUT || res == WAIT_OBJECT_0)
                 return 0;
@@ -184 +184 @@
 #define mkfifo(path, mode) \
     (int)CreateNamedPipeA(path, PIPE_ACCESS_DUPLEX | WRITE_DAC, \
                           PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, \
-                          1024, 1024, 10000, NULL)
+                          1024, 1024, 10000, 0)
 #endif // USING_MINGW
 
 #ifdef USING_MINGW
@@ -202 +202 @@
     if (!FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
                         FORMAT_MESSAGE_IGNORE_INSERTS |
                         FORMAT_MESSAGE_MAX_WIDTH_MASK,
-                        NULL, errCode,
+                        0, errCode,
                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                        errStr, DLERR_MAX - 1, NULL))
+                        errStr, DLERR_MAX - 1, 0))
         snprintf(errStr, DLERR_MAX - 1,
                  "dlopen()/dlsym() caused error %d", (int)errCode);
 

mythtv/libs/libmythdb/httpcomms.cpp

@@ -38 +38 @@
     if (m_timer)
     {
         delete m_timer;
-        m_timer = NULL;
+        m_timer = 0;
     }
 
     delete http;
@@ -46 +46 @@
 
 void HttpComms::init()
 {
- //   m_curRequest = NULL;
+ //   m_curRequest = 0;
     m_authNeeded = false;
     http = new QHttp();
     m_redirectedURL = "";
     m_done = false;
     m_statusCode = 0;
     m_responseReason = "";
-    m_timer = NULL;
+    m_timer = 0;
     m_timeout = false;
     
 
@@ -90 +90 @@
 void HttpComms::request(QUrl               &url, 
                         QHttpRequestHeader &header, 
                         int                 timeoutms, 
-                        QIODevice          *pData /* = NULL*/ )
+                        QIODevice          *pData /* = 0*/ )
 {
     quint16 port = 80;
 
@@ -296 +296 @@
     int redirectCount = 0;
     int timeoutCount = 0;
     QString res = "";
-    HttpComms *httpGrabber = NULL; 
+    HttpComms *httpGrabber = 0; 
     QString hostname = "";
 
     while (1) 
@@ -309 +309 @@
         
         VERBOSE(VB_NETWORK, QString("getHttp: grabbing: %1").arg(qurl.toString()));
 
-        if (httpGrabber != NULL)
+        if (httpGrabber)
             delete httpGrabber; 
         
         httpGrabber = new HttpComms;
@@ -388 +388 @@
     int timeoutCount = 0;
     QByteArray data(0);
     bool res = false;
-    HttpComms *httpGrabber = NULL;
+    HttpComms *httpGrabber = 0;
     QString hostname = "";
 
     while (1)
@@ -403 +403 @@
         VERBOSE(VB_NETWORK, QString("getHttp: grabbing: '%1'")
                                     .arg(qurl.toString()));
 
-        if (httpGrabber != NULL)
+        if (httpGrabber)
             delete httpGrabber;
         
         httpGrabber = new HttpComms;
@@ -515 +515 @@
     int redirectCount = 0;
     int timeoutCount = 0;
     QString res = "";
-    HttpComms *httpGrabber = NULL; 
+    HttpComms *httpGrabber = 0; 
     QString hostname = "";
 
     QHttpRequestHeader header( "POST", url.path() + url.encodedQuery());
@@ -554 +554 @@
         
         VERBOSE(VB_NETWORK, QString("postHttp: grabbing: %1").arg(url.toString()));
 
-        if (httpGrabber != NULL)
+        if (httpGrabber)
             delete httpGrabber; 
         
         httpGrabber = new HttpComms;

mythtv/libs/libmythdb/httpcomms.h

@@ -60 +60 @@
     static QString getHttp(QString& url, int timeoutMS = 10000, 
                            int maxRetries = 3, int maxRedirects = 3,
                            bool allowGzip = false,
-                           Credentials* webCred = NULL,
+                           Credentials* webCred = 0,
                            bool isInQtEventThread = true);
     
     static bool getHttpFile(const QString& file, QString& url, int timeoutMS = 10000,
                             int maxRetries = 3, int maxRedirects = 3, 
-                            bool allowGzip = false, Credentials* webCred = NULL);
+                            bool allowGzip = false, Credentials* webCred = 0);
     
     static QString postHttp(QUrl               &url, 
-                            QHttpRequestHeader *pAddlHdr          = NULL, 
-                            QIODevice          *pData             = NULL,
+                            QHttpRequestHeader *pAddlHdr          = 0, 
+                            QIODevice          *pData             = 0,
                             int                 timeoutMS         = 10000, 
                             int                 maxRetries        = 3, 
                             int                 maxRedirects      = 3, 
                             bool                allowGzip         = false,
-                            Credentials        *webCred           = NULL, 
+                            Credentials        *webCred           = 0, 
                             bool                isInQtEventThread = true );
 
     void request(QUrl &url, int timeoutms = -1, bool allowGzip = false);
-    void request(QUrl &url, QHttpRequestHeader &header, int timeoutms = -1, QIODevice *pData = NULL );
+    void request(QUrl &url, QHttpRequestHeader &header, int timeoutms = -1, QIODevice *pData = 0 );
     
     void setCookie( const QString& cookie ) { m_cookie = cookie; }
     const QString& getCookie() const { return m_cookie; }

mythtv/libs/libmythdb/lcddevice.cpp

@@ -33 +33 @@
 
 LCD::LCD()
     : QObject(),
-      socket(NULL),                 socketLock(QMutex::Recursive),
+      socket(0),                    socketLock(QMutex::Recursive),
       hostname("localhost"),        port(6545),
       bConnected(false),
 
@@ -52 +52 @@
       lcd_showmusic_items(),
       lcd_keystring(),
 
-      GetLEDMask(NULL)
+      GetLEDMask(0)
 {
     send_buffer.clear(); last_command.clear();
     lcd_showmusic_items.clear(); lcd_keystring.clear();
@@ -73 +73 @@
 
 bool LCD::m_enabled = false;
 bool LCD::m_server_unavailable = false;
-class LCD *LCD::m_lcd = NULL;
+class LCD *LCD::m_lcd = 0;
 
 class LCD * LCD::Get(void)
 {
-    if (m_enabled && m_lcd == NULL && m_server_unavailable == false)
+    if (m_enabled && !m_lcd && m_server_unavailable == false)
         m_lcd = new LCD;
     return m_lcd;
 }
@@ -90 +90 @@
     if (m_lcd) 
     {
         delete m_lcd;
-        m_lcd = NULL;
+        m_lcd = 0;
         m_server_unavailable = false;
     }
 
@@ -104 +104 @@
         if (lcd->connectToHost(lcd_host, lcd_port) == false) 
         {
             delete m_lcd;
-            m_lcd = NULL;
+            m_lcd = 0;
             m_server_unavailable = false;
         }
     }
@@ -629 +629 @@
 
 LCD::~LCD()
 {
-    m_lcd = NULL;
+    m_lcd = 0;
 
     VERBOSE(VB_IMPORTANT|VB_EXTRA, LOC + "An LCD device is being snuffed out of "
                     "existence (~LCD() was called)");

mythtv/libs/libmythdb/mythdb.cpp

@@ -5 +5 @@
 #include "mythverbose.h"
 #include "oldsettings.h"
 
-static MythDB *mythdb = NULL;
+static MythDB *mythdb = 0;
 static QMutex dbLock;
 
 unsigned int db_messages = VB_IMPORTANT | VB_GENERAL;
@@ -28 +28 @@
     dbLock.lock();
     if (mythdb)
         delete mythdb;
-    mythdb = NULL;
+    mythdb = 0;
     dbLock.unlock();
 }
 

mythtv/libs/libmythdb/mythdbcon.cpp

@@ -171 +171 @@
 
     m_sem = new QSemaphore(20);
 
-    m_schedCon = NULL;
-    m_DDCon = NULL;
+    m_schedCon = 0;
+    m_DDCon = 0;
 }
 
 MDBManager::~MDBManager()
@@ -303 +303 @@
 
 void InitMSqlQueryInfo(MSqlQueryInfo &qi)
 {
-    qi.db = NULL;
+    qi.db = 0;
     qi.qsqldb = QSqlDatabase();
     qi.returnConnection = true;
 }

mythtv/libs/libmythdb/mythobservable.cpp

@@ -35 +35 @@
     if (m_listener_it != m_listeners.end())
         return *m_listener_it;
     else
-        return NULL;
+        return 0;
 }
 
 QList<QObject*> MythObservable::getListeners()

mythtv/libs/libmythdb/mythsocket.cpp

@@ -90 +90 @@
 
     if (m_cb && ref == 0)
     {
-        m_cb = NULL;
+        m_cb = 0;
         m_readyread_thread.RemoveFromReadyRead(this);
         // thread will downref & delete obj
         return true;
@@ -451 +451 @@
             tv.tv_sec = 0;
             tv.tv_usec = 0;
 
-            int rval = select(maxfd + 1, &rfds, NULL, NULL, &tv);
+            int rval = select(maxfd + 1, &rfds, 0, 0, &tv);
             if (rval)
             {
                 if (bytesAvailable() == 0)
@@ -670 +670 @@
 #ifdef USING_MINGW
     if (readyreadevent) {
         ::CloseHandle(readyreadevent);
-        readyreadevent = NULL;
+        readyreadevent = 0;
     }
 #else
     ::close(m_readyread_pipe[0]);
@@ -686 +686 @@
         if (m_readyread_run == false)
         {
 #ifdef USING_MINGW
-            readyreadevent = ::CreateEvent(NULL, false, false, NULL);
+            readyreadevent = ::CreateEvent(0, false, false, 0);
             assert(readyreadevent);
 #else
             int ret = pipe(m_readyread_pipe);
@@ -824 +824 @@
             if (sock->state() == MythSocket::Connected
                 && !sock->m_notifyread && !isLocked(sock->m_lock))
             {
-                HANDLE hEvent = ::CreateEvent(NULL, false, false, NULL);
+                HANDLE hEvent = ::CreateEvent(0, false, false, 0);
                 if (!hEvent)
                 {
                     VERBOSE(VB_IMPORTANT, "MythSocket: CreateEvent failed");
@@ -918 +918 @@
             ++it;
         }
 
-        int rval = select(maxfd + 1, &rfds, NULL, NULL, NULL);
+        int rval = select(maxfd + 1, &rfds, 0, 0, 0);
         if (rval == -1)
         {
             VERBOSE(VB_SOCKET, "MythSocket: select returned error");

mythtv/libs/libmythdb/mythsocket.h

@@ -62 +62 @@
     friend void ShutdownRRT(void);
 
   public:
-    MythSocket(int socket = -1, MythSocketCBs *cb = NULL);
+    MythSocket(int socket = -1, MythSocketCBs *cb = 0);
 
     enum State {
         Connected,

mythtv/libs/libmythdb/mythverbose.h

@@ -137 +137 @@
             {                                                \
                 struct tm      *tp;                          \
                 struct timeval  tv;                          \
-                gettimeofday(&tv, NULL);                     \
+                gettimeofday(&tv, 0);                        \
                 tp = localtime(&tv.tv_sec);                  \
                 printf("%4d-%02d-%02d %2d:%02d:%02d.%03d ",  \
                        1900+tp->tm_year, 1+tp->tm_mon,       \

mythtv/libs/libmythdb/oldsettings.cpp

@@ -36 +36 @@
 
 Settings::~Settings()
 {
-    if (m_pSettings != NULL)
+    if (m_pSettings)
         delete m_pSettings;
 }