diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-24 14:43:11 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-24 14:43:11 +0300 |
| commit | 2f3fc2f1d6ba418303a4bab6f8fd3caed7d291b4 (patch) | |
| tree | 00bccb466ce49367f6fd54fe9f7f90557eea8738 /src/daemon/cmdline.c | |
| parent | 3025645b0b58f476f6404f2aed3b61a633794d10 (diff) | |
| parent | be46eaa5b6324d84c5ecbed5dd72dec1c87e0cb1 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/Makefile.am
Diffstat (limited to 'src/daemon/cmdline.c')
| -rw-r--r-- | src/daemon/cmdline.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c index ecb38486..f6cdcdc8 100644 --- a/src/daemon/cmdline.c +++ b/src/daemon/cmdline.c @@ -385,11 +385,6 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d pa_xfree(conf->script_commands); conf->script_commands = pa_strbuf_tostring_free(buf); - if (!conf->script_commands) { - pa_xfree(conf->script_commands); - conf->script_commands = NULL; - } - *d = optind; return 0; |