From 3ceaf08b971ce0bfe50bda078ee5c3a640b77034 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 20 Jun 2016 13:46:34 -0400 Subject: [PATCH] logger: stop using carriage returns I believe we fixed up tty settings sometime ago such that we don't need carriage returns anymore. --- src/libply/ply-logger.h | 2 +- src/plugins/splash/details/plugin.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libply/ply-logger.h b/src/libply/ply-logger.h index de231817..545e64cc 100644 --- a/src/libply/ply-logger.h +++ b/src/libply/ply-logger.h @@ -92,7 +92,7 @@ bool ply_logger_is_tracing_enabled (ply_logger_t *logger); ply_logger_flush (logger); \ errno = _old_errno; \ ply_logger_inject (logger, \ - "[%s:%d] %45.45s:" format "\r\n", \ + "[%s:%d] %45.45s:" format "\n", \ __FILE__, __LINE__, __func__, ## args); \ ply_logger_flush (logger); \ errno = _old_errno; \ diff --git a/src/plugins/splash/details/plugin.c b/src/plugins/splash/details/plugin.c index 92993302..f534450b 100644 --- a/src/plugins/splash/details/plugin.c +++ b/src/plugins/splash/details/plugin.c @@ -342,7 +342,7 @@ display_normal (ply_boot_splash_plugin_t *plugin) ply_list_node_t *node; if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL) - write_on_views (plugin, "\r\n", strlen ("\r\n")); + write_on_views (plugin, "\n", strlen ("\n")); plugin->state = PLY_BOOT_SPLASH_DISPLAY_NORMAL; @@ -355,7 +355,7 @@ display_normal (ply_boot_splash_plugin_t *plugin) next_node = ply_list_get_next_node (plugin->messages, node); write_on_views (plugin, message, strlen (message)); - write_on_views (plugin, "\r\n", strlen ("\r\n")); + write_on_views (plugin, "\n", strlen ("\n")); ply_list_remove_node (plugin->messages, node); node = next_node; @@ -370,7 +370,7 @@ display_password (ply_boot_splash_plugin_t *plugin, int i; if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_PASSWORD_ENTRY) - write_on_views (plugin, "\r\n", strlen ("\r\n")); + write_on_views (plugin, "\n", strlen ("\n")); else write_on_views (plugin, CLEAR_LINE_SEQUENCE, @@ -399,7 +399,7 @@ display_question (ply_boot_splash_plugin_t *plugin, const char *entry_text) { if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_QUESTION_ENTRY) - write_on_views (plugin, "\r\n", strlen ("\r\n")); + write_on_views (plugin, "\n", strlen ("\n")); else write_on_views (plugin, CLEAR_LINE_SEQUENCE, @@ -419,7 +419,7 @@ display_message (ply_boot_splash_plugin_t *plugin, { if (plugin->state == PLY_BOOT_SPLASH_DISPLAY_NORMAL) { write_on_views (plugin, message, strlen (message)); - write_on_views (plugin, "\r\n", strlen ("\r\n")); + write_on_views (plugin, "\n", strlen ("\n")); } else { ply_list_append_data (plugin->messages, strdup (message)); } -- 2.47.3