From b71810e2e52c275b29535d62366684a48a5f4793 Mon Sep 17 00:00:00 2001 From: "sanghyeok.oh" Date: Tue, 11 Oct 2016 10:21:55 +0900 Subject: [PATCH] coding style:errno must referenced right after calling standard function Change-Id: I8eff8b174ecb621acbbe73734aa5c35cf5c60bfc Signed-off-by: sanghyeok.oh --- gio/gkdbus.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gio/gkdbus.c b/gio/gkdbus.c index b8a4e61..a69c826 100755 --- a/gio/gkdbus.c +++ b/gio/gkdbus.c @@ -2934,7 +2934,7 @@ _g_kdbus_receive (GKDBusWorker *worker, struct kdbus_cmd_recv recv; struct kdbus_msg *msg; gboolean can_receive; - gint ret; + gint ret = 0; can_receive = TRUE; memset (&recv, 0, sizeof recv); @@ -2942,22 +2942,24 @@ _g_kdbus_receive (GKDBusWorker *worker, again: ret = ioctl (worker->fd, KDBUS_CMD_RECV, &recv); + if (ret < 0) + ret = errno; if (recv.return_flags & KDBUS_RECV_RETURN_DROPPED_MSGS) g_warning ("kdbus: %lld dropped broadcast messages", recv.dropped_msgs); - if (ret < 0) + if (ret != 0) { - if (errno == EINTR) + if (ret == EINTR) goto again; - if (errno == EAGAIN) + if (ret == EAGAIN) return; g_set_error (error, G_IO_ERROR, - g_io_error_from_errno (errno), + g_io_error_from_errno (ret), _("Error while receiving message: %s"), - g_strerror (errno)); + g_strerror (ret)); return; } @@ -3259,6 +3261,8 @@ _g_kdbus_send (GKDBusWorker *worker, } } parts[1] = g_variant_builder_end (&builder); + if (parts[1] == NULL) + g_warning ("failed to make builder"); body = g_dbus_message_get_body (message); if (!body) @@ -3490,6 +3494,7 @@ _g_kdbus_send (GKDBusWorker *worker, */ if (ioctl(worker->fd, KDBUS_CMD_SEND, send)) { + int ret = errno; gchar *info; asprintf (&info, "sender=%s destination=%s path=%s interface=%s member=%s type=%d", g_dbus_message_get_sender (message), @@ -3499,6 +3504,7 @@ _g_kdbus_send (GKDBusWorker *worker, g_dbus_message_get_member (message), g_dbus_message_get_message_type (message)); + errno = ret; if (errno == ENXIO || errno == ESRCH) { g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN, @@ -3531,8 +3537,8 @@ _g_kdbus_send (GKDBusWorker *worker, } else { - g_warning ("kdbus: %s, %s", g_strerror(errno), info); g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "%s, %s", g_strerror(errno), info); + g_warning ("kdbus: %s, %s", g_strerror(errno), info); } result = FALSE; free(info); -- 2.7.4