From da9dd58f34469ff9285233d694d43c2e078461ad Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 7 Jan 2014 09:27:50 +0100 Subject: playlist/soundcloud: eliminate nullptr checks before g_free() --- src/playlist/SoundCloudPlaylistPlugin.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/playlist/SoundCloudPlaylistPlugin.cxx') diff --git a/src/playlist/SoundCloudPlaylistPlugin.cxx b/src/playlist/SoundCloudPlaylistPlugin.cxx index 3059b819e..68262fccb 100644 --- a/src/playlist/SoundCloudPlaylistPlugin.cxx +++ b/src/playlist/SoundCloudPlaylistPlugin.cxx @@ -146,13 +146,11 @@ handle_string(void *ctx, const unsigned char* stringval, switch (data->key) { case Title: - if (data->title != nullptr) - g_free(data->title); + g_free(data->title); data->title = g_strndup(s, stringlen); break; case Stream_URL: - if (data->stream_url != nullptr) - g_free(data->stream_url); + g_free(data->stream_url); data->stream_url = g_strndup(s, stringlen); data->got_url = 1; break; @@ -399,10 +397,8 @@ soundcloud_open_uri(const char *uri, Mutex &mutex, Cond &cond) g_free(u); yajl_free(hand); - if (data.title != nullptr) - g_free(data.title); - if (data.stream_url != nullptr) - g_free(data.stream_url); + g_free(data.title); + g_free(data.stream_url); if (ret == -1) return nullptr; -- cgit v1.2.3