From 0535531d2753f1b86454bb6ffad6ffbdd56c66d0 Mon Sep 17 00:00:00 2001 From: Eric Wetzel Date: Wed, 5 Jan 2011 21:54:12 -0500 Subject: nit: more LOG_* \n fixes Remove extra \n from LOG_DEBUG, LOG_INFO, and LOG_WARNING messages Remove LOG_INFO_N LOG_INFO_N was only used once and had a \n at the end Change LOG_USER_N calls that end with \n to LOG_USER --- src/helper/command.c | 7 +++---- src/helper/log.h | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/helper') diff --git a/src/helper/command.c b/src/helper/command.c index d5ac34b4..85d9463d 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -676,7 +676,7 @@ int command_run_line(struct command_context *context, char *line) { /* We do not print the connection closed error message */ Jim_MakeErrorMessage(interp); - LOG_USER_N("%s\n", Jim_GetString(Jim_GetResult(interp), NULL)); + LOG_USER("%s", Jim_GetString(Jim_GetResult(interp), NULL)); } if (retval == ERROR_OK) { @@ -706,7 +706,7 @@ int command_run_line(struct command_context *context, char *line) buff[chunk] = 0; LOG_USER_N("%s", buff); } - LOG_USER_N("%s", "\n"); + LOG_USER_N("\n"); } retval = ERROR_OK; } @@ -860,8 +860,7 @@ static void command_help_show_wrap(const char *str, unsigned n, unsigned n2) if (next - last < HELP_LINE_WIDTH(n)) cp = next; command_help_show_indent(n); - LOG_USER_N("%.*s", (int)(cp - last), last); - LOG_USER_N("\n"); + LOG_USER("%.*s", (int)(cp - last), last); last = cp + 1; n = n2; } diff --git a/src/helper/log.h b/src/helper/log.h index 2852140b..801ae7f8 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -113,9 +113,6 @@ extern int debug_level; #define LOG_INFO(expr ...) \ log_printf_lf (LOG_LVL_INFO, __FILE__, __LINE__, __FUNCTION__, expr) -#define LOG_INFO_N(expr ...) \ - log_printf (LOG_LVL_INFO, __FILE__, __LINE__, __FUNCTION__, expr) - #define LOG_WARNING(expr ...) \ log_printf_lf (LOG_LVL_WARNING, __FILE__, __LINE__, __FUNCTION__, expr) -- cgit v1.2.3