coding style:errno must referenced right after calling standard function 89/91689/2 accepted/tizen/3.0/common/20161114.110605 accepted/tizen/3.0/ivi/20161028.151229 accepted/tizen/3.0/mobile/20161028.143120 accepted/tizen/3.0/tv/20161028.143435 accepted/tizen/3.0/wearable/20161028.150807 accepted/tizen/common/20161017.170024 accepted/tizen/ivi/20161017.013626 accepted/tizen/mobile/20161017.013600 accepted/tizen/tv/20161017.013609 accepted/tizen/wearable/20161017.013617 submit/tizen/20161014.114439 submit/tizen_3.0/20161028.062323 submit/tizen_3.0/20161028.092423 submit/tizen_3.0_common/20161104.104000
authorsanghyeok.oh <sanghyeok.oh@samsung.com>
Tue, 11 Oct 2016 01:21:55 +0000 (10:21 +0900)
committersanghyeok.oh <sanghyeok.oh@samsung.com>
Tue, 11 Oct 2016 07:36:29 +0000 (16:36 +0900)
Change-Id: I8eff8b174ecb621acbbe73734aa5c35cf5c60bfc
Signed-off-by: sanghyeok.oh <sanghyeok.oh@samsung.com>
gio/gkdbus.c

index b8a4e61..a69c826 100755 (executable)
@@ -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);