From a252b61be1d81f833a3cca87a2294d7fe65532fd Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Tue, 17 Feb 2009 21:59:45 +0200 Subject: main: remove unused lf variable --- src/daemon/main.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/daemon') 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); -- cgit From 2c6abb87938d2172963a99979449c1ff0b63a9f3 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Wed, 18 Feb 2009 19:15:43 +0200 Subject: daemon-conf: make sure c->log_level < LEVEL_MAX --- src/daemon/daemon-conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/daemon') 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)); -- cgit