From 4a40f5c763f3b138b23b1c9b8f3861d0960e1a88 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 11 Nov 2021 16:59:39 +0000 Subject: Remove trailing newlines from logging functions All the GLib logging functions automatically append a newline to the given string. --- libgweather/weather-iwin.c | 11 +++++------ libgweather/weather-metar.c | 11 ++++------- libgweather/weather-metno.c | 15 +++++++-------- libgweather/weather-owm.c | 11 +++++------ 4 files changed, 21 insertions(+), 27 deletions(-) (limited to 'libgweather') diff --git a/libgweather/weather-iwin.c b/libgweather/weather-iwin.c index b6a19cf..163fe7a 100644 --- a/libgweather/weather-iwin.c +++ b/libgweather/weather-iwin.c @@ -315,16 +315,16 @@ iwin_finish (GObject *source, GAsyncResult *result, gpointer data) if (!body) { /* forecast data is not really interesting anyway ;) */ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_debug ("Failed to get IWIN forecast data: %s\n", error->message); + g_debug ("Failed to get IWIN forecast data: %s", error->message); return; } - g_warning ("Failed to get IWIN forecast data: %s\n", error->message); + g_warning ("Failed to get IWIN forecast data: %s", error->message); g_clear_error (&error); _gweather_info_request_done (data, msg); return; } else if (!SOUP_STATUS_IS_SUCCESSFUL (soup_message_get_status (msg))) { g_bytes_unref (body); - g_warning ("Failed to get IWIN forecast data: %d %s\n", + g_warning ("Failed to get IWIN forecast data: [status: %d]: %s", soup_message_get_status (msg), soup_message_get_reason_phrase (msg)); _gweather_info_request_done (data, msg); @@ -353,12 +353,11 @@ iwin_finish (SoupSession *session, SoupMessage *msg, gpointer data) if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { /* forecast data is not really interesting anyway ;) */ if (msg->status_code == SOUP_STATUS_CANCELLED) { - g_debug ("Failed to get IWIN forecast data: %d %s\n", - msg->status_code, + g_debug ("Failed to get IWIN forecast data: %s", msg->reason_phrase); return; } - g_warning ("Failed to get IWIN forecast data: %d %s\n", + g_warning ("Failed to get IWIN forecast data: [status: %d]: %s", msg->status_code, msg->reason_phrase); _gweather_info_request_done (data, msg); diff --git a/libgweather/weather-metar.c b/libgweather/weather-metar.c index e2895b1..9b6233e 100644 --- a/libgweather/weather-metar.c +++ b/libgweather/weather-metar.c @@ -571,10 +571,10 @@ metar_finish (SoupSession *session, SoupMessage *msg, gpointer data) body = soup_session_send_and_read_finish (session, result, &error); if (!body) { if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_debug ("Failed to get METAR data: %s.\n", error->message); + g_debug ("Failed to get METAR data: %s", error->message); return; } - g_warning ("Failed to get METAR data: %s.\n", error->message); + g_warning ("Failed to get METAR data: %s", error->message); _gweather_info_request_done (info, msg); return; } else if (!SOUP_STATUS_IS_SUCCESSFUL (soup_message_get_status (msg))) { @@ -587,8 +587,7 @@ metar_finish (SoupSession *session, SoupMessage *msg, gpointer data) #else if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { if (msg->status_code == SOUP_STATUS_CANCELLED) { - g_debug ("Failed to get METAR data: %d %s.\n", - msg->status_code, + g_debug ("Failed to get METAR data: %s", msg->reason_phrase); return; } @@ -597,9 +596,7 @@ metar_finish (SoupSession *session, SoupMessage *msg, gpointer data) if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) { info->network_error = TRUE; } else { - /* Translators: %d is an error code, and %s the error string */ - g_warning (_ ("Failed to get METAR data: %d %s.\n"), - msg->status_code, + g_warning ("Failed to get METAR data: %s", msg->reason_phrase); } diff --git a/libgweather/weather-metno.c b/libgweather/weather-metno.c index 94c568c..d08bf79 100644 --- a/libgweather/weather-metno.c +++ b/libgweather/weather-metno.c @@ -399,15 +399,15 @@ metno_finish_new (GObject *source, if (!body) { /* forecast data is not really interesting anyway ;) */ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_debug ("Failed to get met.no forecast data: %s\n", error->message); + g_debug ("Failed to get met.no forecast data: %s", error->message); return; } - g_message ("Failed to get met.no forecast data: %s\n", error->message); + g_message ("Failed to get met.no forecast data: %s", error->message); g_clear_error (&error); _gweather_info_request_done (data, msg); return; } else if (!SOUP_STATUS_IS_SUCCESSFUL (soup_message_get_status (msg))) { - g_message ("Failed to get met.no forecast data: %d %s\n", + g_message ("Failed to get met.no forecast data: [status: %d] %s", soup_message_get_status (msg), soup_message_get_reason_phrase (msg)); _gweather_info_request_done (data, msg); @@ -443,14 +443,13 @@ metno_finish_new (SoupSession *session, if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { /* forecast data is not really interesting anyway ;) */ if (msg->status_code == SOUP_STATUS_CANCELLED) { - g_debug ("Failed to get met.no forecast data: %d %s\n", - msg->status_code, + g_debug ("Failed to get met.no forecast data: %s", msg->reason_phrase); return; } - g_message ("Failed to get met.no forecast data: %d %s\n", - msg->status_code, - msg->reason_phrase); + g_debug ("Failed to get met.no forecast data: [status: %d]: %s", + msg->status_code, + msg->reason_phrase); _gweather_info_request_done (user_data, msg); return; } diff --git a/libgweather/weather-owm.c b/libgweather/weather-owm.c index 754fbb0..535e710 100644 --- a/libgweather/weather-owm.c +++ b/libgweather/weather-owm.c @@ -410,18 +410,18 @@ owm_finish (GObject *source, if (!body) { /* forecast data is not really interesting anyway ;) */ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - g_debug ("Failed to get OpenWeatheRMap forecast data: %s\n", + g_debug ("Failed to get OpenWeatheRMap forecast data: %s", error->message); return; } - g_warning ("Failed to get OpenWeatherMap forecast data: %s\n", + g_warning ("Failed to get OpenWeatherMap forecast data: %s", error->message); g_clear_error (&error); _gweather_info_request_done (data, msg); return; } else if (!SOUP_STATUS_IS_SUCCESSFUL (soup_message_get_status (msg))) { g_bytes_unref (body); - g_warning ("Failed to get OpenWeatherMap forecast data: %d %s\n", + g_warning ("Failed to get OpenWeatherMap forecast data: [status: %d]: %s", soup_message_get_status (msg), soup_message_get_reason_phrase (msg)); _gweather_info_request_done (data, msg); @@ -451,12 +451,11 @@ owm_finish (SoupSession *session, if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { /* forecast data is not really interesting anyway ;) */ if (msg->status_code == SOUP_STATUS_CANCELLED) { - g_debug ("Failed to get OpenWeatherMap forecast data: %d %s\n", - msg->status_code, + g_debug ("Failed to get OpenWeatherMap forecast data: %s", msg->reason_phrase); return; } - g_warning ("Failed to get OpenWeatherMap forecast data: %d %s\n", + g_warning ("Failed to get OpenWeatherMap forecast data: [status: %d]: %s", msg->status_code, msg->reason_phrase); _gweather_info_request_done (user_data, msg); -- cgit v1.2.1