From 45ff3558358827ea60f6c0c8f2335e20c07293ed Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 14 Aug 2012 02:14:24 +0200
Subject: playlist_song: improve const-correctness
---
src/playlist_song.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/playlist_song.c b/src/playlist_song.c
index 85089a4d1..019ea8c55 100644
--- a/src/playlist_song.c
+++ b/src/playlist_song.c
@@ -112,7 +112,7 @@ playlist_check_translate_song(struct song *song, const char *base_uri,
/* already ok */
return song;
- char *uri = song->uri;
+ const char *uri = song->uri;
if (uri_has_scheme(uri)) {
if (uri_supported_scheme(uri))
@@ -149,13 +149,12 @@ playlist_check_translate_song(struct song *song, const char *base_uri,
base_uri = NULL;
}
+ char *allocated = NULL;
if (base_uri != NULL)
- uri = g_build_filename(base_uri, uri, NULL);
- else
- uri = g_strdup(uri);
+ uri = allocated = g_build_filename(base_uri, uri, NULL);
struct song *dest = playlist_check_load_song(song, uri, secure);
song_free(song);
- g_free(uri);
+ g_free(allocated);
return dest;
}
--
cgit v1.2.3