From 7e1feffd2a714a1e0d094d9e11dc8ae000755802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 1 Nov 2011 15:30:02 +0100 Subject: Fix some issues flagged by cppcheck --- confdloader.c | 2 +- pending_notifications.c | 5 +++-- recdone.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/confdloader.c b/confdloader.c index bb195aa..3109c1f 100644 --- a/confdloader.c +++ b/confdloader.c @@ -132,8 +132,8 @@ bool cConfDLoader::LoadFile(const char *FileName) } } } + fclose(f); } - fclose(f); return true; } else diff --git a/pending_notifications.c b/pending_notifications.c index bd96953..659b5a3 100644 --- a/pending_notifications.c +++ b/pending_notifications.c @@ -153,9 +153,10 @@ bool cPendingNotifications::Load(const char *FileName) LogFile.iSysLog("loading %s", fileName); FILE *f = fopen(fileName, "r"); bool result = false; - if (f) + if (f) { result = cPendingNotification::Read(f); - fclose(f); + fclose(f); + } if (result) LogFile.Log(2,"loaded pending notifications from %s (count: %d)", fileName, Count()); else diff --git a/recdone.c b/recdone.c index ede8655..0d9b11e 100644 --- a/recdone.c +++ b/recdone.c @@ -397,9 +397,10 @@ bool cRecsDone::Load(const char *FileName) LogFile.iSysLog("loading %s", fileName); FILE *f = fopen(fileName, "r"); bool result = false; - if (f) + if (f) { result = cRecDone::Read(f); - fclose(f); + fclose(f); + } if (result) LogFile.Log(2,"loaded recordings done from %s (count: %d)", fileName, Count()); else -- cgit v1.2.3