From 5f2350251bddaa3be7fe2fbc510cf253e7fc971f Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 20 Dec 2015 16:56:49 +0100 Subject: Fix memory leak. --- src/configfile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/configfile.cc b/src/configfile.cc index 6b0d14f..7a063d8 100644 --- a/src/configfile.cc +++ b/src/configfile.cc @@ -65,7 +65,7 @@ static std::string configPath() configpath = szPath; } #else - std::string configpath = strdup(getenv("HOME")); + std::string configpath = getenv("HOME"); #endif configpath += SEP; configpath += CONFIGDIRNAME; -- cgit v1.2.3 From 03ee8f797ddf8ba4701e394998a28aa7ee5c7ffb Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 20 Dec 2015 16:57:52 +0100 Subject: Fix uninitialised warning. --- src/drumkit.h | 4 ++-- src/drumkitloader.h | 8 ++++---- src/instrumentparser.h | 8 ++++---- src/thread.h | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/drumkit.h b/src/drumkit.h index 04b2c56..a9ceb80 100644 --- a/src/drumkit.h +++ b/src/drumkit.h @@ -56,13 +56,13 @@ public: size_t samplerate(); private: - void *magic; + void *magic{nullptr}; std::string _file; std::string _name; std::string _description; - size_t _samplerate; + size_t _samplerate{0}; VersionStr _version; }; diff --git a/src/drumkitloader.h b/src/drumkitloader.h index 2c0ea8e..b4a0a69 100644 --- a/src/drumkitloader.h +++ b/src/drumkitloader.h @@ -89,11 +89,11 @@ private: Semaphore run_semaphore; Semaphore semaphore; Mutex mutex; - volatile bool running; + volatile bool running{false}; std::list load_queue; - size_t total_num_audiofiles; - size_t fraction; - size_t loaded; + size_t total_num_audiofiles{0}; + size_t fraction{1}; + size_t loaded{0}; }; #endif/*__DRUMGIZMO_DRUMKITLOADER_H__*/ diff --git a/src/instrumentparser.h b/src/instrumentparser.h index 2a7a9c9..60a6261 100644 --- a/src/instrumentparser.h +++ b/src/instrumentparser.h @@ -47,14 +47,14 @@ protected: int readData(char *data, size_t size); private: - FILE *fd; + FILE *fd{nullptr}; Instrument &instrument; - Sample *s; + Sample *s{nullptr}; std::string path; - level_t lower; - level_t upper; + level_t lower{0}; + level_t upper{0}; }; #endif/*__DRUMGIZMO_INSTRUMENTPARSER_H__*/ diff --git a/src/thread.h b/src/thread.h index f2c1dd0..33435e6 100644 --- a/src/thread.h +++ b/src/thread.h @@ -46,10 +46,10 @@ protected: private: #ifdef WIN32 - HANDLE tid; + HANDLE tid{nullptr}; static DWORD WINAPI #else - pthread_t tid; + pthread_t tid{0}; static void* #endif/*WIN32*/ thread_run(void *data); -- cgit v1.2.3 From 0fa481dabf620181c852f43923a3c4b049294ab4 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 20 Dec 2015 16:59:00 +0100 Subject: Fix numeric limits and uninitialised warnings. --- src/semaphore.cc | 6 ++++-- src/semaphore.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/semaphore.cc b/src/semaphore.cc index 47ce8e0..3f5781f 100644 --- a/src/semaphore.cc +++ b/src/semaphore.cc @@ -28,6 +28,8 @@ #include +#include + #ifdef WIN32 #include #else @@ -53,7 +55,7 @@ Semaphore::Semaphore(const char *name) #ifdef WIN32 prv->semaphore = CreateSemaphore(NULL, // default security attributes 0, // initial count - 2147483647, // maximum count (Max LONG) + std::numeric_limits::max(), NULL); // unnamed semaphore #else sem_init(&prv->semaphore, 0, 0); @@ -70,7 +72,7 @@ Semaphore::~Semaphore() sem_destroy(&prv->semaphore); #endif - if(prv) delete prv; + delete prv; } void Semaphore::post() diff --git a/src/semaphore.h b/src/semaphore.h index 7e39f5a..ed284de 100644 --- a/src/semaphore.h +++ b/src/semaphore.h @@ -38,8 +38,8 @@ public: void wait(); private: - struct semaphore_private_t *prv; - const char *name; + struct semaphore_private_t *prv{nullptr}; + const char *name{nullptr}; }; #endif/*__PRACRO_SEMAPHORE_H__*/ -- cgit v1.2.3