aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2007-03-20 21:05:42 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2007-03-20 21:05:42 +0000
commitc2c485262074802105f65fdac0254e9b0a62bdce (patch)
tree5a46577174ff5a466dbb28a59cf89e7a4412bc95
parent28c2a1e433848092fd37b2244d431fa01d320e1a (diff)
downloadmpd-c2c485262074802105f65fdac0254e9b0a62bdce.tar.gz
mpd-c2c485262074802105f65fdac0254e9b0a62bdce.tar.xz
mpd-c2c485262074802105f65fdac0254e9b0a62bdce.zip
Doing those previous SONG_* commits properly. Thanks to normalperson for
pointing it out. git-svn-id: https://svn.musicpd.org/mpd/trunk@5673 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/playlist.c4
-rw-r--r--src/tag.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/playlist.c b/src/playlist.c
index 9f4623e61..e22185be0 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1637,12 +1637,12 @@ static void PlaylistInfoPrintInfo(int fd, char *utf8file, char **erroredfile)
if (song) {
printSongInfo(fd, song);
} else {
- fdprintf(fd, "%s%s\n", SONG_FILE, utf8file);
+ fdprintf(fd, SONG_FILE "%s\n", utf8file);
}
}
static void PlaylistInfoPrint(int fd, char *utf8file, char **erroredfile)
{
- fdprintf(fd, "%s%s\n", SONG_FILE, utf8file);
+ fdprintf(fd, SONG_FILE "%s\n", utf8file);
}
static void PlaylistLoadIterFunc(int fd, char *temp, char **erroredFile)
diff --git a/src/tag.c b/src/tag.c
index a98225739..36edef793 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -121,7 +121,7 @@ void printMpdTag(int fd, MpdTag * tag)
int i;
if (tag->time >= 0)
- fdprintf(fd, "%s%i\n", SONG_TIME, tag->time);
+ fdprintf(fd, SONG_TIME "%i\n", tag->time);
for (i = 0; i < tag->numOfItems; i++) {
fdprintf(fd, "%s: %s\n", mpdTagItemKeys[tag->items[i].type],