From eb8ac00d795be355154f237d7e29f8ecf9999846 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 26 Jan 2014 17:00:20 +0100 Subject: [PATCH] gui: Add trailing newline to all log messages. Currently we have a funny mixture of the two styles. This is no problem since curses_log() will chop the trailing newline. But let's better be consistent. --- gui.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gui.c b/gui.c index 18375d9b..de662854 100644 --- a/gui.c +++ b/gui.c @@ -928,13 +928,13 @@ static void handle_signal(int sig) } return; case SIGINT: - PARA_WARNING_LOG("caught SIGINT, reset"); + PARA_WARNING_LOG("caught SIGINT, reset\n"); /* Nothing to do. SIGINT killed our child which gets noticed * by do_select and resets everything. */ return; case SIGUSR1: - PARA_NOTICE_LOG("got SIGUSR1, rereading configuration"); + PARA_NOTICE_LOG("got SIGUSR1, rereading configuration\n"); com_reread_conf(); return; case SIGCHLD: @@ -1039,7 +1039,7 @@ repeat: flags[i] = 0; } if (ret < 0) { - PARA_NOTICE_LOG("closing command fd %d: %s", + PARA_NOTICE_LOG("closing command fd %d: %s\n", i, para_strerror(-ret)); close(command_fds[i]); command_fds[i] = -1; @@ -1049,7 +1049,7 @@ repeat: return 0; } if (cbo[i] == COMMAND_BUF_SIZE - 1) { - PARA_NOTICE_LOG("discarding overlong line"); + PARA_NOTICE_LOG("discarding overlong line\n"); cbo[i] = 0; flags[i] = FELF_DISCARD_FIRST; } @@ -1110,9 +1110,9 @@ static void send_output(void) if (ret < 0) goto fail; if (do_select(COMMAND_MODE) >= 0) - PARA_INFO_LOG("command complete"); + PARA_INFO_LOG("command complete\n"); else - PARA_NOTICE_LOG("command aborted"); + PARA_NOTICE_LOG("command aborted\n"); print_in_bar(COLOR_MSG, " "); return; fail: @@ -1350,10 +1350,10 @@ static void com_reread_conf(void) }; if (!cf) { - PARA_WARNING_LOG("there is no configuration to read"); + PARA_WARNING_LOG("there is no configuration to read\n"); return; } - PARA_INFO_LOG("rereading command line options and config file"); + PARA_INFO_LOG("rereading command line options and config file\n"); gui_cmdline_parser_ext(_argc, _argv, &conf, ¶ms); /* * Despite .print_errors is set to 0, gengetopt will print to stderr @@ -1362,7 +1362,7 @@ static void com_reread_conf(void) shutdown_curses(); gui_cmdline_parser_config_file(cf, &conf, ¶ms); init_curses(); - PARA_NOTICE_LOG("config file reloaded"); + PARA_NOTICE_LOG("config file reloaded\n"); if (check_key_map_args() < 0) finish(EXIT_FAILURE); } @@ -1407,7 +1407,7 @@ static void com_help(void) static void com_shrink_top_win(void) { if (top.lines <= theme.top_lines_min) { - PARA_WARNING_LOG("can not decrease top window"); + PARA_WARNING_LOG("can not decrease top window\n"); return; } init_wins(top.lines - 1); @@ -1419,7 +1419,7 @@ static void com_shrink_top_win(void) static void com_enlarge_top_win(void) { if (bot.lines < 3) { - PARA_WARNING_LOG("can not increase top window"); + PARA_WARNING_LOG("can not increase top window\n"); return; } init_wins(top.lines + 1); @@ -1453,7 +1453,7 @@ static void change_theme(int next) /* This seems to be needed twice, why? */ com_refresh(); com_refresh(); - PARA_NOTICE_LOG("new theme: %s", theme.name); + PARA_NOTICE_LOG("new theme: %s\n", theme.name); } static void com_next_theme(void) -- 2.39.5