aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/SidplayDecoderPlugin.cxx
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/decoder/SidplayDecoderPlugin.cxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/decoder/SidplayDecoderPlugin.cxx b/src/decoder/SidplayDecoderPlugin.cxx
index 160337594..8b3e3f8c0 100644
--- a/src/decoder/SidplayDecoderPlugin.cxx
+++ b/src/decoder/SidplayDecoderPlugin.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
#include "SidplayDecoderPlugin.hxx"
#include "../DecoderAPI.hxx"
#include "tag/TagHandler.hxx"
+#include "util/Alloc.hxx"
#include "util/Domain.hxx"
#include "system/ByteOrder.hxx"
#include "Log.hxx"
@@ -121,7 +122,7 @@ sidplay_finish()
static char *
get_container_name(const char *path_fs)
{
- char *path_container=g_strdup(path_fs);
+ char *path_container = strdup(path_fs);
if(!g_pattern_match(path_with_subtune,
strlen(path_container), path_container, nullptr))
@@ -163,9 +164,9 @@ get_song_length(const char *path_fs)
if (songlength_database == nullptr)
return -1;
- gchar *sid_file=get_container_name(path_fs);
+ char *sid_file = get_container_name(path_fs);
SidTuneMod tune(sid_file);
- g_free(sid_file);
+ free(sid_file);
if(!tune) {
LogWarning(sidplay_domain,
"failed to load file for calculating md5 sum");
@@ -209,7 +210,7 @@ sidplay_file_decode(Decoder &decoder, const char *path_fs)
char *path_container=get_container_name(path_fs);
SidTune tune(path_container, nullptr, true);
- g_free(path_container);
+ free(path_container);
if (!tune) {
LogWarning(sidplay_domain, "failed to load file");
return;
@@ -346,7 +347,7 @@ sidplay_scan_file(const char *path_fs,
char *path_container=get_container_name(path_fs);
SidTune tune(path_container, nullptr, true);
- g_free(path_container);
+ free(path_container);
if (!tune)
return false;