2018-10-03: version 1.1.144 (horchi)\n change: Fixed g++-8 warnings\n\n1.1.144

8 files changed, 26 insertions, 24 deletions

diff --git a/HISTORY.h b/HISTORY.h
index a03b2bb..7eb3d2c 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
  * -----------------------------------
  */
 
-#define _VERSION     "1.1.143"
-#define VERSION_DATE "02.10.2018"
+#define _VERSION     "1.1.144"
+#define VERSION_DATE "03.10.2018"
 #define DB_API       7
 
 #ifdef GIT_REV
@@ -17,10 +17,12 @@
 /*
  * ------------------------------------
  *
- 
+2018-10-03: version 1.1.144 (horchi)
+     change: Fixed g++-8 warnings
+
 2018-10-02: version 1.1.143 (horchi)
-     change: Fixed compile problem of epglv 
- 
+     change: Fixed compile problem of epglv
+
 2018-09-02: version 1.1.142 (horchi)
      added: Auto update of modified channelids
      change: systemd now default in Make.config
diff --git a/Make.config b/Make.config
index 4e06fc7..29c5d65 100644
--- a/Make.config
+++ b/Make.config
@@ -30,7 +30,7 @@ INIT_AFTER   = mysql.service
 ifdef USE_CLANG
   CC = clang++
 else
-  CC = g++
+  CC = g++-8
 endif
 
 doCompile = $(CC) -c $(CFLAGS) $(DEFINES)
diff --git a/PLUGINS/epgdata/epgdata.c b/PLUGINS/epgdata/epgdata.c
index d368d30..9ad4b35 100644
--- a/PLUGINS/epgdata/epgdata.c
+++ b/PLUGINS/epgdata/epgdata.c
@@ -196,7 +196,7 @@ int Epgdata::initDb()
          stat(file, &sb);
          free(file);
 
-         asprintf(&tag, "%ld", sb.st_size);
+         asprintf(&tag, "%" PRId64, sb.st_size);
          asprintf(&fileRef, "%s-%s", dp->d_name, tag);
 
          // store file and let tag NULL to indicate that processing is needed
diff --git a/episode.c b/episode.c
index af07bd2..a014f67 100644
--- a/episode.c
+++ b/episode.c
@@ -271,19 +271,19 @@ int cEpisodeFile::storeToTable(cDbTable* episodeDb, const cList<cLine>* linkLine
 
       if (!isEmpty(ex1) && !isEmpty(col1Name))
       {
-         snprintf(ex, 250, "%s: %s", col1Name, ex1);
+         sprintf(ex, "%.20s: %.220s", col1Name, ex1);
          episodeDb->setValue("EXTRACOL1", ex);
       }
 
       if (!isEmpty(ex2) && !isEmpty(col2Name))
       {
-         snprintf(ex, 250, "%s: %s", col2Name, ex2);
+         sprintf(ex, "%.20s: %.220s", col2Name, ex2);
          episodeDb->setValue("EXTRACOL2", ex);
       }
 
       if (!isEmpty(ex3) && !isEmpty(col3Name))
       {
-         snprintf(ex, 250, "%s: %s", col3Name, ex3);
+         sprintf(ex, "%.20s: %.220s", col3Name, ex3);
          episodeDb->setValue("EXTRACOL3", ex);
       }
 
diff --git a/httpd.c b/httpd.c
index fc88279..5999fe9 100644
--- a/httpd.c
+++ b/httpd.c
@@ -297,7 +297,7 @@ int cEpgHttpd::init()
    {
       struct sockaddr_in localSockAddr;
       const char* bindIp = getIpOf(EpgdConfig.httpDevice);
-      long localAddr;
+      in_addr_t localAddr;
 
       memset((char*)&localSockAddr, 0, sizeof(localSockAddr));
       localSockAddr.sin_family = AF_INET;
diff --git a/lib/searchtimer.c b/lib/searchtimer.c
index 0eb7218..d844c18 100644
--- a/lib/searchtimer.c
+++ b/lib/searchtimer.c
@@ -1060,7 +1060,7 @@ int cSearchTimer::getDoneFor(cDbRow* searchTimer, cDbRow* useevent, json_t* obj)
 
    if (!useeventsDb->find())
    {
-      tell(0, "Warning: Event '%s/%lu/%s' not found",
+      tell(0, "Warning: Event '%s/%" PRId64 "/%s' not found",
            useevent->getStrValue("CHANNELID"),
            useevent->getBigintValue("CNTEVENTID"),
            useevent->getStrValue("CNTSOURCE"));
diff --git a/tvdbmanager.c b/tvdbmanager.c
index 7f047fe..4489818 100644
--- a/tvdbmanager.c
+++ b/tvdbmanager.c
@@ -130,18 +130,18 @@ void cTVDBManager::UpdateSeries(void) {
     set_intersection(updatedEpisodes.begin(), updatedEpisodes.end(), storedEpisodes.begin(),
                      storedEpisodes.end(), std::inserter(scrapEpisodeIDs, scrapEpisodeIDs.begin()));
 
-    tell(0, "%ld updated Series, %ld updatedEpisodes", updatedSeries.size(), updatedEpisodes.size());
-    tell(0, "%ld series to update in db, %ld episodes to update in db", scrapSeriesIDs.size(), scrapEpisodeIDs.size());
+    tell(0, "%" PRIuMAX " updated Series, %ld updatedEpisodes", updatedSeries.size(), updatedEpisodes.size());
+    tell(0, "%" PRIuMAX " series to update in db, %ld episodes to update in db", scrapSeriesIDs.size(), scrapEpisodeIDs.size());
     int seriesCur = 1;
     for (set<int>::iterator it = scrapSeriesIDs.begin(); !cEpgd::doShutDown() && it != scrapSeriesIDs.end(); it++) {
-        if (seriesCur%10 == 0)
-            tell(0, "ReScraped %d series...continuing rescraping", seriesCur);
-        cTVDBSeries *series = ScrapSeries(*it);
-        if (series) {
-            SaveSeries(series);
-        }
-        delete series;
-        seriesCur++;
+       if (seriesCur % 10 == 0)
+          tell(0, "ReScraped %d series...continuing rescraping", seriesCur);
+       cTVDBSeries *series = ScrapSeries(*it);
+       if (series) {
+          SaveSeries(series);
+       }
+       delete series;
+       seriesCur++;
     }
     if (seriesCur > 1)
         tell(0, "ReScraped %d series", seriesCur-1);
diff --git a/update.c b/update.c
index a5384d6..1a71174 100644
--- a/update.c
+++ b/update.c
@@ -1036,7 +1036,7 @@ int cEpgd::initDb()
       {
          string comp;
 
-         tell(0, "Update comp of %ld in 'Maintanance Mode'", eventsDb->getBigintValue("EVENTID"));
+         tell(0, "Update comp of %" PRId64 "in 'Maintanance Mode'", eventsDb->getBigintValue("EVENTID"));
 
          if (!eventsDb->isNull("TITLE"))
          {
@@ -2155,7 +2155,7 @@ int cEpgd::parseEvent(cDbRow* event, xmlNode* node)
                               event->getStrValue("FILEREF"));
 
    else
-      tell(4, "no images for event %ld in %s",
+      tell(4, "no images for event %" PRId64 " in %s",
            event->getBigintValue("EVENTID"),
            event->getStrValue("FILEREF"));