summaryrefslogtreecommitdiff
path: root/src/system
diff options
context:
space:
mode:
authorLassi Marttala <Lassi.LM.Marttala@partner.bmw.de>2013-01-25 13:56:08 +0100
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2013-07-19 16:54:21 +0200
commit06d85034559e3d7fd7a10e1caaa77fe79bf25a68 (patch)
tree572c57690f04bcb798dfba9b0b38266283556f3e /src/system
parent78e1afcc7a1e0f3f7103ee242bdd08c1bef755ee (diff)
downloadDLT-daemon-06d85034559e3d7fd7a10e1caaa77fe79bf25a68.tar.gz
Fix compiler warnings
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src/system')
-rw-r--r--src/system/dlt-system-filetransfer.c2
-rw-r--r--src/system/dlt-system-watchdog.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/system/dlt-system-filetransfer.c b/src/system/dlt-system-filetransfer.c
index d0ff7c7..64ac487 100644
--- a/src/system/dlt-system-filetransfer.c
+++ b/src/system/dlt-system-filetransfer.c
@@ -659,7 +659,7 @@ int wait_for_files(FiletransferOptions const *opts)
struct inotify_event *ie = (struct inotify_event *)&buf[i];
if(ie->len > 0)
{
- if(ie->mask & IN_CLOSE_WRITE || ie->mask & IN_MOVED_TO)
+ if((ie->mask & IN_CLOSE_WRITE) || (ie->mask & IN_MOVED_TO))
{
int j;
for(j = 0;j < opts->Count;j++)
diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c
index 5eef59b..a45ef30 100644
--- a/src/system/dlt-system-watchdog.c
+++ b/src/system/dlt-system-watchdog.c
@@ -66,7 +66,11 @@ void wait_period (PeriodicData *info)
{
unsigned long long missed;
- read (info->timer_fd, &missed, sizeof (missed));
+ if(read (info->timer_fd, &missed, sizeof (missed)) < 0)
+ {
+ DLT_LOG(watchdogContext, DLT_LOG_ERROR,
+ DLT_STRING("Could not read from timer file descriptor in watchdog.\n"));
+ }
if (missed > 0)
{