aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-15 09:17:06 +0100
committerMax Kellermann <max@duempel.org>2009-01-15 09:17:06 +0100
commit29baf0c190e9f5e2ccbd98cb8aa300ea91b194cd (patch)
tree811025ab9cd21bb0e97cbfd2b50564d8d20ded5c
parent2151e2ea53d124af100c573024d8e1626c8d4390 (diff)
downloadmpd-29baf0c190e9f5e2ccbd98cb8aa300ea91b194cd.tar.gz
mpd-29baf0c190e9f5e2ccbd98cb8aa300ea91b194cd.tar.xz
mpd-29baf0c190e9f5e2ccbd98cb8aa300ea91b194cd.zip
log, pcm_convert: added return statements after g_error()
gcc doesn't know that g_error() never returns. Work around the gcc warning.
-rw-r--r--src/log.c4
-rw-r--r--src/pcm_convert.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/log.c b/src/log.c
index 47419eec5..73f2cb3ce 100644
--- a/src/log.c
+++ b/src/log.c
@@ -210,9 +210,11 @@ parse_log_level(const char *value, unsigned line)
return LOG_LEVEL_SECURE;
else if (0 == strcmp(value, "verbose"))
return G_LOG_LEVEL_DEBUG;
- else
+ else {
g_error("unknown log level \"%s\" at line %u\n",
value, line);
+ return G_LOG_LEVEL_MESSAGE;
+ }
}
void log_init(bool verbose, bool use_stdout)
diff --git a/src/pcm_convert.c b/src/pcm_convert.c
index 67aed8185..2209249a6 100644
--- a/src/pcm_convert.c
+++ b/src/pcm_convert.c
@@ -145,6 +145,7 @@ size_t pcm_convert(const struct audio_format *inFormat,
default:
g_error("cannot convert to %u bit\n", outFormat->bits);
+ return 0;
}
}