From 7daa89ab6355415d221239956fb5507f39760cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Thu, 28 Jul 2011 16:01:05 -0400
Subject: [PATCH] * #6392: pluginmanagertest: fix warnings reported by valgrind
---
sflphone-common/test/pluginmanagertest.cpp | 8 ++------
sflphone-common/test/pluginmanagertest.h | 6 +++++-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sflphone-common/test/pluginmanagertest.cpp b/sflphone-common/test/pluginmanagertest.cpp
index cffbf4c3bb..ade4a0dcbb 100644
--- a/sflphone-common/test/pluginmanagertest.cpp
+++ b/sflphone-common/test/pluginmanagertest.cpp
@@ -133,13 +133,9 @@ void PluginManagerTest::tearDown()
delete _pm;
_pm=0;
- if (plugin)
- delete plugin;
-
+ delete plugin;
plugin = 0;
- if (library)
- delete library;
-
+ delete library;
library = 0;
}
diff --git a/sflphone-common/test/pluginmanagertest.h b/sflphone-common/test/pluginmanagertest.h
index 2a2e78bf78..b3a2b5b68f 100644
--- a/sflphone-common/test/pluginmanagertest.h
+++ b/sflphone-common/test/pluginmanagertest.h
@@ -65,7 +65,11 @@ class PluginManagerTest : public CppUnit::TestCase {
CPPUNIT_TEST_SUITE_END();
public:
- PluginManagerTest() : CppUnit::TestCase("Plugin Manager Tests") {}
+ PluginManagerTest() : CppUnit::TestCase("Plugin Manager Tests")
+ , _pm(0)
+ , library(0)
+ , plugin(0)
+ {}
/*
* Code factoring - Common resources can be initialized here.
--
GitLab