diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-07-25 03:11:09 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-07-25 03:11:09 +0200 |
commit | 8343360da1d8d93e8e3818ab91e7f764a1c8c99e (patch) | |
tree | 6f3b984c7a894ff9d7a4e0e394dc82ffe109d8f2 /src/pulse/context.c | |
parent | 6ce7d208f066f02ee837686e81faa1463a5e2945 (diff) |
client: minor modernizations
Diffstat (limited to 'src/pulse/context.c')
-rw-r--r-- | src/pulse/context.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index 7ba33249..7c3717fa 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -701,9 +701,8 @@ static int context_autospawn(pa_context *c) { /* Child */ const char *state = NULL; -#define MAX_ARGS 64 - const char * argv[MAX_ARGS+1]; - int n; + const char * argv[32]; + unsigned n = 0; if (c->spawn_api.atfork) c->spawn_api.atfork(); @@ -712,12 +711,10 @@ static int context_autospawn(pa_context *c) { /* Setup argv */ - n = 0; - argv[n++] = c->conf->daemon_binary; argv[n++] = "--start"; - while (n < MAX_ARGS) { + while (n < PA_ELEMENTSOF(argv)-1) { char *a; if (!(a = pa_split_spaces(c->conf->extra_arguments, &state))) @@ -727,10 +724,10 @@ static int context_autospawn(pa_context *c) { } argv[n++] = NULL; + pa_assert(n <= PA_ELEMENTSOF(argv)); execv(argv[0], (char * const *) argv); _exit(1); -#undef MAX_ARGS } /* Parent */ |