aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2005-10-25 20:35:16 +0000
committerEric Wong <normalperson@yhbt.net>2005-10-25 20:35:16 +0000
commit402c8cd707640f7bd857c3387a03bb4db40222d7 (patch)
treec9613b968fb1e091910349d689ac22755795f7c7
parentf1d24a4b92f11b57f3589c098b33bce8f47681f4 (diff)
downloadmpd-402c8cd707640f7bd857c3387a03bb4db40222d7.tar.gz
mpd-402c8cd707640f7bd857c3387a03bb4db40222d7.tar.xz
mpd-402c8cd707640f7bd857c3387a03bb4db40222d7.zip
debug messages no longer cause segfaults :P
git-svn-id: https://svn.musicpd.org/mpd/trunk@3553 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/ls.c8
-rw-r--r--src/song.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/src/ls.c b/src/ls.c
index 9cdf4bb66..762ddd672 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -278,11 +278,9 @@ InputPlugin * hasMusicSuffix(char * utf8file) {
InputPlugin * isMusic(char * utf8file, time_t * mtime) {
if(isFile(utf8file,mtime)) {
- InputPlugin *plugin = hasMusicSuffix(utf8file);
- if (plugin == NULL) {
- DEBUG("isMusic: %s is not a supported music file\n");
- }
- return plugin;
+ InputPlugin * plugin = hasMusicSuffix(utf8file);
+ if (plugin != NULL)
+ return plugin;
}
DEBUG("isMusic: %s is not a valid file\n",utf8file);
return NULL;
diff --git a/src/song.c b/src/song.c
index d8c265879..9a2c8d67d 100644
--- a/src/song.c
+++ b/src/song.c
@@ -50,7 +50,7 @@ Song * newSong(char * url, int type, Directory * parentDir) {
Song * song = NULL;
if(strchr(url, '\n')) {
- DEBUG("newSong: '%s' is not a valid uri\n");
+ DEBUG("newSong: '%s' is not a valid uri\n",url);
return NULL;
}