summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-12-10 15:43:58 +0800
committerLennart Poettering <lennart@poettering.net>2010-01-05 22:46:13 +0100
commit937c587e7720ee27b36fe736a2aa1cfd233270ec (patch)
tree2a27eb73a340d0175a667eba34d2b773b82df75f /src/daemon
parent6faf38313e5f313cbcfe5c78af1dd310131798d2 (diff)
fix a number of warnings
most of them were due to missing #ifdefs or wrong printf format type for [s]size_t.
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/daemon-conf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index bfd5c118..79dd49af 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -466,6 +466,7 @@ static int parse_rtprio(const char *filename, unsigned line, const char *section
return 0;
}
+#ifdef HAVE_DBUS
static int parse_server_type(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
pa_daemon_conf *c = data;
@@ -481,6 +482,7 @@ static int parse_server_type(const char *filename, unsigned line, const char *se
return 0;
}
+#endif
int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
int r = -1;
@@ -666,12 +668,14 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
[PA_LOG_ERROR] = "error"
};
+#ifdef HAVE_DBUS
static const char* const server_type_to_string[] = {
[PA_SERVER_TYPE_UNSET] = "!!UNSET!!",
[PA_SERVER_TYPE_USER] = "user",
[PA_SERVER_TYPE_SYSTEM] = "system",
[PA_SERVER_TYPE_NONE] = "none"
};
+#endif
pa_strbuf *s;
char cm[PA_CHANNEL_MAP_SNPRINT_MAX];