6 files changed, 12 insertions, 12 deletions
diff --git a/lib/common.c b/lib/common.c
index 8a0e9ac..9207083 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -1443,7 +1443,7 @@ const char* getMacOf(const char* device)
    int s;
 
    s = socket(AF_INET, SOCK_DGRAM, 0);
-   strcpy(ifr.ifr_name, "eth0");
+   strcpy(ifr.ifr_name, device);
    ioctl(s, SIOCGIFHWADDR, &ifr);
 
    for (int i = 0; i < macTuppel; i++)
diff --git a/lib/common.h b/lib/common.h
index df1c236..b488783 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -133,7 +133,7 @@ int gunzip(MemoryStruct* zippedData, MemoryStruct* unzippedData);
 // MemoryStruct
 //***************************************************************************
 
-struct MemoryStruct
+class MemoryStruct
 {
    public:
 
diff --git a/lib/curl.c b/lib/curl.c
index c8dda08..a8c806f 100644
--- a/lib/curl.c
+++ b/lib/curl.c
@@ -24,16 +24,16 @@ cSystemNotification* cCurl::sysNotification = 0;
 size_t collect_data(void *ptr, size_t size, size_t nmemb, void* stream)
 {
    std::string sTmp;
-   register size_t actualsize = size * nmemb;
+   size_t actualsize = size * nmemb;
 
-   if ((FILE *)stream == NULL)
+   if (!stream)
    {
-      sTmp.assign((char *)ptr, actualsize);
+      sTmp.assign((char*)ptr, actualsize);
       cCurl::sBuf += sTmp;
    }
    else
    {
-      fwrite(ptr, size, nmemb, (FILE *)stream);
+      fwrite(ptr, size, nmemb, (FILE*)stream);
    }
 
    return actualsize;
@@ -309,7 +309,7 @@ void cCurl::Free(char* str)
 size_t cCurl::WriteMemoryCallback(void* ptr, size_t size, size_t nmemb, void* data)
 {
    size_t realsize = size * nmemb;
-   struct MemoryStruct* mem = (struct MemoryStruct*)data;
+   MemoryStruct* mem = (MemoryStruct*)data;
 
    if (sysNotification)
       sysNotification->check();
@@ -332,7 +332,7 @@ size_t cCurl::WriteMemoryCallback(void* ptr, size_t size, size_t nmemb, void* da
 size_t cCurl::WriteHeaderCallback(char* ptr, size_t size, size_t nmemb, void* data)
 {
    size_t realsize = size * nmemb;
-   struct MemoryStruct* mem = (struct MemoryStruct*)data;
+   MemoryStruct* mem = (MemoryStruct*)data;
    char* p;
 
    if (sysNotification)
diff --git a/lib/db.h b/lib/db.h
index a93f840..efb5ebf 100644
--- a/lib/db.h
+++ b/lib/db.h
@@ -1052,7 +1052,7 @@ class cDbConnection
 
       MYSQL* mysql;
 
-      int initialized;
+      // int initialized;
       int attached;
       int inTact;
       int connectDropped;
diff --git a/lib/searchtimer.c b/lib/searchtimer.c
index b516359..cfe69e4 100644
--- a/lib/searchtimer.c
+++ b/lib/searchtimer.c
@@ -774,7 +774,7 @@ int cSearchTimer::checkTimers()
       {
          // if difference < 2 minutes adjust silent
 
-         if (abs(timerDb->getIntValue("_STARTTIME") - useeventsDb->getIntValue("STARTTIME")) > 2*tmeSecondsPerMinute)
+         if (std::abs(timerDb->getIntValue("_STARTTIME") - useeventsDb->getIntValue("STARTTIME")) > 2*tmeSecondsPerMinute)
             parent->message(0, 'I', "EPGD: Timer action", "Info: Starttime of event (%ld) '%s' changed from '%s' to '%s', updating timer (%ld)",
                             timerDb->getIntValue("EVENTID"), useeventsDb->getStrValue("TITLE"),
                             l2pTime(timerDb->getIntValue("_STARTTIME")).c_str(), l2pTime(useeventsDb->getIntValue("STARTTIME")).c_str(),
diff --git a/lib/searchtimer.h b/lib/searchtimer.h
index f4c072c..92fffc8 100644
--- a/lib/searchtimer.h
+++ b/lib/searchtimer.h
@@ -79,7 +79,7 @@ class cSearchTimer
       cDbTable* timerDb;
       cDbTable* mapDb;
       cDbTable* vdrDb;
-      cDbTable* messageDb;
+      // cDbTable* messageDb;
 
       cDbStatement* selectChannelFromMap;
       cDbStatement* selectDoneTimer;
@@ -87,7 +87,7 @@ class cSearchTimer
       cDbStatement* selectSearchtimerMaxModSp;
       cDbStatement* selectSearchTimerByName;
       cDbStatement* selectSearchTimerById;
-      cDbStatement* selectActiveVdrs;
+      // cDbStatement* selectActiveVdrs;
       cDbStatement* selectAllTimer;
       cDbStatement* selectRPTimerByEvent;
       cDbStatement* selectTimerByEventId;