mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-conf: Remove redundant function parameters

Browse source
This commit is contained in:
Tanu Kaskinen 2014-03-19 12:19:07 +02:00
parent aca30527e2
commit 0a583fe0c3
8 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/daemon/main.c
View file

@ -346,9 +346,9 @@ static char *check_configured_address(void) {
char *default_server = NULL; char *default_server = NULL;
pa_client_conf *c = pa_client_conf_new(); pa_client_conf *c = pa_client_conf_new();
pa_client_conf_load(c, NULL); pa_client_conf_load(c);
#ifdef HAVE_X11 #ifdef HAVE_X11
pa_client_conf_from_x11(c, NULL); pa_client_conf_from_x11(c);
#endif #endif
pa_client_conf_env(c); pa_client_conf_env(c);

2
src/daemon/server-lookup.c
View file

@ -126,7 +126,7 @@ static enum get_address_result_t get_address(pa_server_type_t server_type, char
*address = NULL; *address = NULL;
if (pa_client_conf_load(conf, NULL) < 0) { if (pa_client_conf_load(conf) < 0) {
r = FAILED_TO_LOAD_CLIENT_CONF; r = FAILED_TO_LOAD_CLIENT_CONF;
goto finish; goto finish;
} }

5
src/pulse/client-conf-x11.c
View file

@ -37,14 +37,15 @@
#include "client-conf-x11.h" #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; xcb_connection_t *xcb = NULL;
int ret = -1, screen = 0; int ret = -1, screen = 0;
char t[1024]; char t[1024];
pa_assert(c); pa_assert(c);
if (!dname && !(dname = getenv("DISPLAY"))) if (!(dname = getenv("DISPLAY")))
goto finish; goto finish;
if (*dname == 0) if (*dname == 0)

6
src/pulse/client-conf-x11.h
View file

@ -24,8 +24,8 @@
#include "client-conf.h" #include "client-conf.h"
/* Load client configuration data from the specified X11 display, /* Load client configuration data from X11, overwriting the current settings in
* overwriting the current settings in *c */ * *c. */
int pa_client_conf_from_x11(pa_client_conf *c, const char *display); int pa_client_conf_from_x11(pa_client_conf *c);
#endif #endif

18
src/pulse/client-conf.c
View file

@ -90,7 +90,7 @@ void pa_client_conf_free(pa_client_conf *c) {
pa_xfree(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; FILE *f = NULL;
char *fn = NULL; char *fn = NULL;
int r = -1; int r = -1;
@ -113,21 +113,9 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
{ NULL, NULL, NULL, NULL }, { NULL, NULL, NULL, NULL },
}; };
if (filename) { if (!(f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn)))
if (errno != ENOENT)
if (!(f = pa_fopen_cloexec(filename, "r"))) {
pa_log(_("Failed to open configuration file '%s': %s"), fn, pa_cstrerror(errno));
goto finish; 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; r = f ? pa_config_parse(fn, f, table, NULL, NULL) : 0;

7
src/pulse/client-conf.h
View file

@ -39,10 +39,9 @@ typedef struct pa_client_conf {
pa_client_conf *pa_client_conf_new(void); pa_client_conf *pa_client_conf_new(void);
void pa_client_conf_free(pa_client_conf *c); void pa_client_conf_free(pa_client_conf *c);
/* Load the configuration data from the specified file, overwriting /* Load the configuration data from the client configuration file, overwriting
* the current settings in *c. When the filename is NULL, the * the current settings in *c. */
* default client configuration file name is used. */ int pa_client_conf_load(pa_client_conf *c);
int pa_client_conf_load(pa_client_conf *c, const char *filename);
/* Load the configuration data from the environment of the current /* Load the configuration data from the environment of the current
process, overwriting the current settings in *c. */ process, overwriting the current settings in *c. */

4
src/pulse/context.c
View file

@ -166,9 +166,9 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char *
#endif #endif
c->conf = pa_client_conf_new(); c->conf = pa_client_conf_new();
pa_client_conf_load(c->conf, NULL); pa_client_conf_load(c->conf);
#ifdef HAVE_X11 #ifdef HAVE_X11
pa_client_conf_from_x11(c->conf, NULL); pa_client_conf_from_x11(c->conf);
#endif #endif
pa_client_conf_env(c->conf); pa_client_conf_env(c->conf);

2
src/utils/pax11publish.c
View file

@ -152,7 +152,7 @@ int main(int argc, char *argv[]) {
char hx[PA_NATIVE_COOKIE_LENGTH*2+1]; char hx[PA_NATIVE_COOKIE_LENGTH*2+1];
assert(conf); 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")); fprintf(stderr, _("Failed to load client configuration file.\n"));
goto finish; goto finish;
} }