Doing those previous SONG_* commits properly. Thanks to normalperson for

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)

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],