[pulseaudio-discuss] [PATCH 1/2] client-conf: Remove redundant function parameters

[Tanu Kaskinen]

---
 src/daemon/main.c           |  4 ++--
 src/daemon/server-lookup.c  |  2 +-
 src/pulse/client-conf-x11.c |  5 +++--
 src/pulse/client-conf-x11.h |  6 +++---
 src/pulse/client-conf.c     | 18 +++---------------
 src/pulse/client-conf.h     |  7 +++----
 src/pulse/context.c         |  4 ++--
 src/utils/pax11publish.c    |  2 +-
 8 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/daemon/main.c b/src/daemon/main.c
index e01371e..02a8ea6 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 82c8851..1f088e6 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;
     }
diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c
index 8d0c612..b37f837 100644
--- a/src/pulse/client-conf-x11.c
+++ b/src/pulse/client-conf-x11.c
@@ -37,14 +37,15 @@
 
 #include "client-conf-x11.h"
 
-int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
+int pa_client_conf_from_x11(pa_client_conf *c) {
+    const char *dname;
     xcb_connection_t *xcb = NULL;
     int ret = -1, screen = 0;
     char t[1024];
 
     pa_assert(c);
 
-    if (!dname && !(dname = getenv("DISPLAY")))
+    if (!(dname = getenv("DISPLAY")))
         goto finish;
 
     if (*dname == 0)
diff --git a/src/pulse/client-conf-x11.h b/src/pulse/client-conf-x11.h
index dca9f0d..3d1dea0 100644
--- a/src/pulse/client-conf-x11.h
+++ b/src/pulse/client-conf-x11.h
@@ -24,8 +24,8 @@
 
 #include "client-conf.h"
 
-/* Load client configuration data from the specified X11 display,
- * overwriting the current settings in *c */
-int pa_client_conf_from_x11(pa_client_conf *c, const char *display);
+/* Load client configuration data from X11, overwriting the current settings in
+ * *c. */
+int pa_client_conf_from_x11(pa_client_conf *c);
 
 #endif
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index ee0271b..ea583a3 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -90,7 +90,7 @@ void pa_client_conf_free(pa_client_conf *c) {
     pa_xfree(c);
 }
 
-int pa_client_conf_load(pa_client_conf *c, const char *filename) {
+int pa_client_conf_load(pa_client_conf *c) {
     FILE *f = NULL;
     char *fn = NULL;
     int r = -1;
@@ -113,21 +113,9 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
         { NULL,                     NULL,                     NULL, NULL },
     };
 
-    if (filename) {
-
-        if (!(f = pa_fopen_cloexec(filename, "r"))) {
-            pa_log(_("Failed to open configuration file '%s': %s"), fn, pa_cstrerror(errno));
+    if (!(f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn)))
+        if (errno != ENOENT)
             goto finish;
-        }
-
-        fn = pa_xstrdup(fn);
-
-    } else {
-
-        if (!(f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn)))
-            if (errno != ENOENT)
-                goto finish;
-    }
 
     r = f ? pa_config_parse(fn, f, table, NULL, NULL) : 0;
 
diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index 87d42d8..c6c74ca 100644
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -39,10 +39,9 @@ typedef struct pa_client_conf {
 pa_client_conf *pa_client_conf_new(void);
 void pa_client_conf_free(pa_client_conf *c);
 
-/* Load the configuration data from the specified file, overwriting
- * the current settings in *c. When the filename is NULL, the
- * default client configuration file name is used. */
-int pa_client_conf_load(pa_client_conf *c, const char *filename);
+/* Load the configuration data from the client configuration file, overwriting
+ * the current settings in *c. */
+int pa_client_conf_load(pa_client_conf *c);
 
 /* Load the configuration data from the environment of the current
    process, overwriting the current settings in *c. */
diff --git a/src/pulse/context.c b/src/pulse/context.c
index b78df27..761d13c 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -166,9 +166,9 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char *
 #endif
 
     c->conf = pa_client_conf_new();
-    pa_client_conf_load(c->conf, NULL);
+    pa_client_conf_load(c->conf);
 #ifdef HAVE_X11
-    pa_client_conf_from_x11(c->conf, NULL);
+    pa_client_conf_from_x11(c->conf);
 #endif
     pa_client_conf_env(c->conf);
 
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index abb2312..f79975d 100644
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -152,7 +152,7 @@ int main(int argc, char *argv[]) {
             char hx[PA_NATIVE_COOKIE_LENGTH*2+1];
             assert(conf);
 
-            if (pa_client_conf_load(conf, NULL) < 0) {
+            if (pa_client_conf_load(conf) < 0) {
                 fprintf(stderr, _("Failed to load client configuration file.\n"));
                 goto finish;
             }
-- 
1.8.3.1