summaryrefslogtreecommitdiff
path: root/src/daemon
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-03-19 12:19:07 +0200
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-03-28 14:58:14 +0200
commit0a583fe0c330d167f52784585afffdd8065a92cd (patch)
tree4d0c0e61c6d281c739e071583ee85c1640581e4b /src/daemon
parentaca30527e2f8241b52433a81f7e857b726d5093c (diff)
client-conf: Remove redundant function parameters
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/main.c4
-rw-r--r--src/daemon/server-lookup.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c
index e01371ed5..02a8ea649 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -346,9 +346,9 @@ static char *check_configured_address(void) {
char *default_server = NULL;
pa_client_conf *c = pa_client_conf_new();
- pa_client_conf_load(c, NULL);
+ pa_client_conf_load(c);
#ifdef HAVE_X11
- pa_client_conf_from_x11(c, NULL);
+ pa_client_conf_from_x11(c);
#endif
pa_client_conf_env(c);
diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
index 82c88510a..1f088e6de 100644
--- a/src/daemon/server-lookup.c
+++ b/src/daemon/server-lookup.c
@@ -126,7 +126,7 @@ static enum get_address_result_t get_address(pa_server_type_t server_type, char
*address = NULL;
- if (pa_client_conf_load(conf, NULL) < 0) {
+ if (pa_client_conf_load(conf) < 0) {
r = FAILED_TO_LOAD_CLIENT_CONF;
goto finish;
}