[CodeClean] handle error case

Handle error case, add line comment and fix build error.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-internal.c b/src/libnnstreamer-edge/nnstreamer-edge-internal.c
index e682880313aee342abfd7cac3101a1b448a8e3e3..c54570c159a4bcb7b4c1c81a366af44b3700c157 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-internal.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-internal.c
@@ -1169,12 +1169,16 @@ _nns_edge_create_socket_listener (nns_edge_handle_s * eh)
     return false;
   }
 
-  if (bind (eh->listener_fd, (struct sockaddr *) &saddr, saddr_len) < 0 ||
-      listen (eh->listener_fd, N_BACKLOG) < 0) {
+  if (bind (eh->listener_fd, (struct sockaddr *) &saddr, saddr_len) < 0) {
     nns_edge_loge ("Failed to create listener, cannot bind socket.");
     goto error;
   }
 
+  if (listen (eh->listener_fd, N_BACKLOG) < 0) {
+    nns_edge_loge ("Failed to create listener, cannot listen socket.");
+    goto error;
+  }
+
   pthread_attr_init (&attr);
   pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_JOINABLE);
   status = pthread_create (&eh->listener_thread, &attr,

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c b/src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c
index cd8a659604188f7f5714355f48388ce370cacd00..c6bbb28296862ce47d935cf219e320405e1ac504 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c
@@ -87,8 +87,8 @@ on_message_callback (struct mosquitto *client, void *data,
 
       nns_edge_data_destroy (data_h);
       SAFE_FREE (msg);
-      return;
     } else {
+      /* Push received message into msg queue. DO NOT free msg here. */
       nns_edge_queue_push (bh->message_queue, msg, msg_len, nns_edge_free);
     }
   }

diff --git a/src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c b/src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c
index ef90e4f5393b4c272086c79d6b92382a8964da9e..61836de124b44dcdfae536fa590d2c7750fe2537 100644 (file)
--- a/src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c
+++ b/src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c
@@ -50,6 +50,7 @@ mqtt_cb_message_arrived (void *context, char *topic, int topic_len,
   nns_edge_broker_s *bh;
   char *msg = NULL;
   nns_size_t msg_len;
+  int ret;
 
   UNUSED (topic);
   UNUSED (topic_len);
@@ -77,7 +78,7 @@ mqtt_cb_message_arrived (void *context, char *topic, int topic_len,
 
       if (nns_edge_data_create (&data_h) != NNS_EDGE_ERROR_NONE) {
         nns_edge_loge ("Failed to create data handle in msg thread.");
-        return;
+        return TRUE;
       }
 
       nns_edge_data_deserialize (data_h, (void *) msg, (nns_size_t) msg_len);
@@ -90,8 +91,8 @@ mqtt_cb_message_arrived (void *context, char *topic, int topic_len,
 
       nns_edge_data_destroy (data_h);
       SAFE_FREE (msg);
-      return;
     } else {
+      /* Push received message into msg queue. DO NOT free msg here. */
       nns_edge_queue_push (bh->message_queue, msg, msg_len, nns_edge_free);
     }
   }