Improve msc_send_ready() and msc_send_result() functions

Change-Id: Ifcfd19e06eeaf62bc1a542b82faf0540cd2e4d86

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index 4a02986005c94d25d887c58965ef3dea322c2a5b..5b6a1a346a2a4d28d3db037ac85ab8ead5038ea3 100644 (file)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <malloc.h>
@@ -27,12 +26,10 @@
 #include "media-util.h"
 #include "media-server-ipc.h"
 #include "media-common-types.h"
-#include "media-common-utils.h"
-#include "media-common-db-svc.h"
 #include "media-scanner-dbg-v2.h"
 #include "media-scanner-scan-v2.h"
 #include "media-scanner-socket-v2.h"
-#include "media-scanner-extract-v2.h"
+
 #define SUPPORT_PARTIAL_EVENT
 
 gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer data)
@@ -101,53 +98,45 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d
 
 int msc_send_ready(void)
 {
-       int res = MS_MEDIA_ERR_NONE;
+       int ret = MS_MEDIA_ERR_NONE;
        ms_comm_msg_s send_msg;
        int fd = -1;
-       int err = -1;
 
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
-       if (fd < 0) {
-               MS_DBG_STRERROR("fifo read failed");
-               return MS_MEDIA_ERR_INTERNAL;
-       }
+       MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_INTERNAL, "fifo open failed");
 
-       /* send ready message */
        memset(&send_msg, 0, sizeof(send_msg));
        send_msg.msg_type = MS_MSG_SCANNER_READY;
 
        /* send ready message */
-       err = write(fd, &send_msg, sizeof(send_msg));
-       if (err < 0) {
+       if (write(fd, &send_msg, sizeof(send_msg)) < 0) {
                MS_DBG_STRERROR("fifo write failed");
-               res = MS_MEDIA_ERR_INTERNAL;
+               ret = MS_MEDIA_ERR_INTERNAL;
        }
 
        close(fd);
 
-       return res;
+       return ret;
 }
 
 int msc_send_result(int result, ms_comm_msg_s *res_data)
 {
-       MS_DBG_SLOG("msc_send_result msg_type=%d", res_data->msg_type);
-       int res = MS_MEDIA_ERR_NONE;
+       int ret = MS_MEDIA_ERR_NONE;
+       ms_comm_msg_s send_msg;
+       int fd = -1;
 
        if (result == MS_MEDIA_ERR_SCANNER_FORCE_STOP) {
                MS_DBG_WARN("msc_send_result -701 will not be sent");
-               return res;
+               return ret;
        }
-       ms_comm_msg_s send_msg;
-       int fd = -1;
-       int err = -1;
+
+       MS_DBG_RETVM_IF(!res_data, MS_MEDIA_ERR_INTERNAL, "res_data is invalid");
 
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
-       if (fd < 0) {
-               MS_DBG_STRERROR("fifo open failed");
-               return MS_MEDIA_ERR_INTERNAL;
-       }
+       MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_INTERNAL, "fifo open failed");
+
+       MS_DBG_SLOG("msc_send_result msg_type = [%d]", res_data->msg_type);
 
-       /* send result message */
        memset(&send_msg, 0x0, sizeof(ms_comm_msg_s));
        if (res_data->msg_type == MS_MSG_SCANNER_COMPLETE)
                send_msg.msg_type = MS_MSG_SCANNER_COMPLETE;
@@ -159,16 +148,15 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        send_msg.result = result;
        SAFE_STRLCPY(send_msg.msg, res_data->msg, sizeof(send_msg.msg));
 
-       /* send ready message */
-       err = write(fd, &send_msg, sizeof(send_msg));
-       if (err < 0) {
+       /* send result message */
+       if (write(fd, &send_msg, sizeof(send_msg)) < 0) {
                MS_DBG_STRERROR("fifo write failed");
-               res = MS_MEDIA_ERR_INTERNAL;
+               ret = MS_MEDIA_ERR_INTERNAL;
        }
 
        close(fd);
 
-       return res;
+       return ret;
 }
 
 /* define of  SUPPORT_PARTIAL_EVENT is disabled, send partial result will not be active */
@@ -215,5 +203,3 @@ int msc_send_result_partial(int result, ms_msg_type_e msg_type, int pid, const c
        return MS_MEDIA_ERR_NONE;
 #endif
 }
-
-

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index 053c5527e8d86582d2d6a2ca6f88f21dca6987d1..1051fff9aa1ab4199e43b0caea73d47b38ceeb14 100644 (file)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <malloc.h>
@@ -27,8 +26,6 @@
 #include "media-util.h"
 #include "media-server-ipc.h"
 #include "media-common-types.h"
-#include "media-common-utils.h"
-#include "media-common-db-svc.h"
 #include "media-scanner-dbg.h"
 #include "media-scanner-socket.h"
 #include "media-scanner-scan.h"
@@ -109,7 +106,6 @@ int msc_send_ready(void)
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
        MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_INTERNAL, "fifo open failed");
 
-       /* send ready message */
        memset(&send_msg, 0, sizeof(send_msg));
        send_msg.msg_type = MS_MSG_SCANNER_READY;
 
@@ -130,10 +126,11 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        ms_comm_msg_s send_msg;
        int fd = -1;
 
+       MS_DBG_RETVM_IF(!res_data, MS_MEDIA_ERR_INTERNAL, "res_data is invalid");
+
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
        MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_INTERNAL, "fifo open failed");
 
-       /* send result message */
        memset(&send_msg, 0x0, sizeof(ms_comm_msg_s));
        send_msg.msg_type = MS_MSG_SCANNER_BULK_RESULT;
        send_msg.pid = res_data->pid;
@@ -141,7 +138,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        send_msg.uid = res_data->uid;
        SAFE_STRLCPY(send_msg.msg, res_data->msg, sizeof(send_msg.msg));
 
-       /* send ready message */
+       /* send result message */
        if (write(fd, &send_msg, sizeof(send_msg)) < 0) {
                MS_DBG_STRERROR("fifo write failed");
                ret = MS_MEDIA_ERR_INTERNAL;
@@ -151,4 +148,3 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
 
        return ret;
 }
-