From f9814ed4ffb143189b561a6039b73eedc7df18bc Mon Sep 17 00:00:00 2001 From: anbr Date: Sat, 28 Jan 2017 13:36:23 +0100 Subject: Fix some warning --- ffont.h | 2 +- imon.c | 12 ++++++------ po/de_DE.po | 2 +- po/it_IT.po | 2 +- watch.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ffont.h b/ffont.h index 68deb7c..3f9640b 100644 --- a/ffont.h +++ b/ffont.h @@ -58,7 +58,7 @@ public: class ciMonFont : public cFont { private: int height; - int bottom; + unsigned int bottom; int width; FT_Library library; ///< Handle to library FT_Face face; ///< Handle to face object diff --git a/imon.c b/imon.c index f9e5d78..7c9183e 100644 --- a/imon.c +++ b/imon.c @@ -330,11 +330,12 @@ bool ciMonLCD::flush() else nCopy = 0; } - if(nCopy!=packetSize) - memset(tx_buf, 0xFF , packetSize); - if(nCopy) - memcpy(tx_buf, fb + offset, nCopy); - + if(nCopy!=packetSize) { + memset(tx_buf, 0xFF , packetSize); + } + if(nCopy) { + memcpy(tx_buf, fb + offset, nCopy); + } /* Add the memory register byte to the packet data. */ tx_buf[packetSize] = msb; @@ -520,7 +521,6 @@ bool ciMonLCD::SendCmd(const uint64_t & cmdData) { unsigned char buf[8]; if(!this->isopen()) { - dsyslog("iMonLCD: can't write : %08llx", cmdData); esyslog("iMonLCD: error writing to dead file descriptor"); return false; } diff --git a/po/de_DE.po b/po/de_DE.po index f7e44e6..744917e 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2010-04-18 18:21+0200\n" "Last-Translator: Andreas Brachold \n" "Language-Team: Andreas Brachold \n" -"Language: \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/it_IT.po b/po/it_IT.po index dfdd0b5..8db9712 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2010-08-09 20:18+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" -"Language: \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/watch.c b/watch.c index 2157e08..7410339 100644 --- a/watch.c +++ b/watch.c @@ -201,13 +201,13 @@ void ciMonWatch::shutdown(int nExitMode) { } case eOnExitMode_WAKEUP: { isyslog("iMonLCD: closing, set wakeup time and showing clock."); - SendCmdClock(t ? t->StartTime() - (theSetup.m_nWakeup * 60) : NULL); + SendCmdClock(t ? t->StartTime() - (theSetup.m_nWakeup * 60) : 0); break; } default: case eOnExitMode_SHOWCLOCK: { isyslog("iMonLCD: closing, showing clock."); - SendCmdClock(NULL); + SendCmdClock(0); break; } } @@ -834,7 +834,7 @@ void ciMonWatch::Recording(const cDevice *pDevice, const char *szName, const cha } } else { - esyslog("iMonLCD: Recording: only up to %d devices are supported by this plugin", memberof(m_nCardIsRecording)); + esyslog("iMonLCD: Recording: only up to %u devices are supported by this plugin", (unsigned int) memberof(m_nCardIsRecording)); } } -- cgit v1.2.3