diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-02-20 03:21:46 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-02-20 03:21:46 +0100 |
| commit | 7bc1847596bdedea6a06c8c0a019da773476a965 (patch) | |
| tree | 521be5207d649ff24f022c9bfe31a716a2674317 /src/daemon | |
| parent | 26a270a934f0f174f7bd7eb89e85301963721deb (diff) | |
| parent | 2e250aaebb7708b25b5342d8ced657364adedc95 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/daemon-conf.c | 2 | ||||
| -rw-r--r-- | src/daemon/main.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 7d3b89f0..7dfef27f 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -639,7 +639,7 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) { if (c->config_file) pa_strbuf_printf(s, _("### Read from configuration file: %s ###\n"), c->config_file); - pa_assert(c->log_level <= PA_LOG_LEVEL_MAX); + pa_assert(c->log_level < PA_LOG_LEVEL_MAX); pa_strbuf_printf(s, "daemonize = %s\n", pa_yes_no(c->daemonize)); pa_strbuf_printf(s, "fail = %s\n", pa_yes_no(c->fail)); diff --git a/src/daemon/main.c b/src/daemon/main.c index d3e02fa0..5f94ec66 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -348,7 +348,6 @@ int main(int argc, char *argv[]) { pa_time_event *win32_timer; struct timeval win32_tv; #endif - char *lf = NULL; int autospawn_fd = -1; pa_bool_t autospawn_locked = FALSE; @@ -1000,9 +999,6 @@ finish: pa_autospawn_lock_done(FALSE); } - if (lf) - pa_xfree(lf); - #ifdef OS_IS_WIN32 if (win32_timer) pa_mainloop_get_api(mainloop)->time_free(win32_timer); |