Delete meaningless error types

Change-Id: Ia0d8020b2c074ae3d7d60f23679fe0830315bbe7
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util-err.h b/lib/include/media-util-err.h
index df3ec08..0cd8819 100755 (executable)
--- a/lib/include/media-util-err.h
+++ b/lib/include/media-util-err.h
@@ -27,46 +27,38 @@
 /* Internal operation error*/
 #define MS_MEDIA_ERR_INTERNAL                                          -1
 #define MS_MEDIA_ERR_INVALID_PARAMETER                 -2      /* Invalid parameter(s) */
-#define MS_MEDIA_ERR_OUT_OF_MEMORY                             -4      /* Out of memory */
-#define MS_MEDIA_ERR_NOT_ENOUGH_SPACE                  -5      /* not enough space in storage */
-#define MS_MEDIA_ERR_UNSUPPORTED_CONTENT               -7      /* Not Supported Media Type */
-#define MS_MEDIA_ERR_NOT_SUPPORTED_FEATURE             -8      /* Feature not supported */
-#define MS_MEDIA_ERR_PERMISSION_DENIED                 -9      /* Do have permission of request */
+#define MS_MEDIA_ERR_OUT_OF_MEMORY                             -3      /* Out of memory */
+#define MS_MEDIA_ERR_NOT_ENOUGH_SPACE                  -4      /* not enough space in storage */
+#define MS_MEDIA_ERR_UNSUPPORTED_CONTENT               -5      /* Not Supported Media Type */
+#define MS_MEDIA_ERR_NOT_SUPPORTED_FEATURE             -6      /* Feature not supported */
+#define MS_MEDIA_ERR_PERMISSION_DENIED                 -7      /* Do have permission of request */
 
 /* DB operation error*/
 #define MS_MEDIA_ERR_DB_CONNECT_FAIL                           -101    /* connecting database fails */
-#define MS_MEDIA_ERR_DB_UPDATE_FAIL                            -105    /* updating record fails */
-#define MS_MEDIA_ERR_DB_BUSY_FAIL                                      -106    /* DB Busy */
-#define MS_MEDIA_ERR_DB_CONSTRAINT_FAIL                        -108    /* DB CONSTRAINT fails - In case of insert, the record already exists */
-#define MS_MEDIA_ERR_DB_NO_RECORD                              -110    /* Item not found in DB */
-#define MS_MEDIA_ERR_DB_CORRUPT                                        -112    /* DB corrut error */
-#define MS_MEDIA_ERR_DB_PERMISSION                             -113    /* DB permission error */
-#define MS_MEDIA_ERR_DB_FULL_FAIL                                      -114    /* DB storage full error */
-#define MS_MEDIA_ERR_DB_RESET                                          -116    /* media DB is reset */
-#define MS_MEDIA_ERR_DB_INTERNAL                                       -150    /* DB internal error */
+#define MS_MEDIA_ERR_DB_UPDATE_FAIL                            -102    /* updating record fails */
+#define MS_MEDIA_ERR_DB_BUSY_FAIL                                      -103    /* DB Busy */
+#define MS_MEDIA_ERR_DB_CONSTRAINT_FAIL                        -104    /* DB CONSTRAINT fails - In case of insert, the record already exists */
+#define MS_MEDIA_ERR_DB_NO_RECORD                              -105    /* Item not found in DB */
+#define MS_MEDIA_ERR_DB_CORRUPT                                        -106    /* DB corrut error */
+#define MS_MEDIA_ERR_DB_PERMISSION                             -107    /* DB permission error */
+#define MS_MEDIA_ERR_DB_FULL_FAIL                                      -108    /* DB storage full error */
+#define MS_MEDIA_ERR_DB_RESET                                          -109    /* media DB is reset */
+#define MS_MEDIA_ERR_DB_INTERNAL                                       -110    /* DB internal error */
 
 /* IPC operation error*/
 #define MS_MEDIA_ERR_IPC                                       -200
 
 /* FILE error*/
-#define MS_MEDIA_ERR_FILE_OPEN_FAIL                            -601    /* file opennig fails */
-#define MS_MEDIA_ERR_FILE_READ_FAIL                            -603    /* file reading fails */
-#define MS_MEDIA_ERR_FILE_WRITE_FAIL                           -604    /* file writing fails */
-#define MS_MEDIA_ERR_FILE_NOT_EXIST                            -605    /* file does not exist */
-#define MS_MEDIA_ERR_FILE_IO                                           -606    /* file does not exist */
+#define MS_MEDIA_ERR_FILE_NOT_EXIST                            -600    /* file does not exist */
 
 /* MEDIA SERVER error*/
-#define MS_MEDIA_ERR_SCANNER_FORCE_STOP                        -701    /* scanning is stopped forcely */
+#define MS_MEDIA_ERR_SCANNER_FORCE_STOP                        -700    /* scanning is stopped forcely */
 
 /* Thumbnail error*/
 #define MS_MEDIA_ERR_THUMB_TOO_BIG                             -801    /* Original is too big to make thumb */
 #define MS_MEDIA_ERR_THUMB_UNSUPPORTED         -803    /* Unsupported content */
 
 /*ETC*/
-#define MS_MEDIA_ERR_VCONF_SET_FAIL                            -901    /* vconf setting fails*/
-#define MS_MEDIA_ERR_SCANNER_NOT_READY                 -903    /* scanner is not ready */
-#define MS_MEDIA_ERR_DYNAMIC_LINK                              -904    /* fail to dynamic link */
-#define MS_MEDIA_ERR_SEND_NOTI_FAIL                            -907    /* sending notification is failed */
 #define MS_MEDIA_ERR_USB_UNMOUNTED                             -908    /* USB unmounted */
 #define MS_MEDIA_ERR_DB_LIMIT_1                                        -909
 

diff --git a/lib/media-util-noti-internal.c b/lib/media-util-noti-internal.c
index b1e6bb7..4683f3a 100755 (executable)
--- a/lib/media-util-noti-internal.c
+++ b/lib/media-util-noti-internal.c
@@ -65,7 +65,7 @@ int media_db_update_send_internal(int pid, /* mandatory */
        if (!bus) {
                MSAPI_DBG("Failed to get gdbus connection: %s", error->message);
                g_error_free(error);
-               return MS_MEDIA_ERR_SEND_NOTI_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        if (item == MS_MEDIA_ITEM_FILE) {
@@ -75,7 +75,7 @@ int media_db_update_send_internal(int pid, /* mandatory */
                        message = g_variant_new("(iiissis)", item, pid, update_type, path, uuid, media_type, mime_type);
                } else {
                        MSAPI_DBG_ERR("uuid or mime_type is NULL");
-                       return MS_MEDIA_ERR_SEND_NOTI_FAIL;
+                       return MS_MEDIA_ERR_INTERNAL;
                }
        } else if (item == MS_MEDIA_ITEM_DIRECTORY) {
                MSAPI_DBG("DIRECTORY CHANGED");
@@ -90,7 +90,7 @@ int media_db_update_send_internal(int pid, /* mandatory */
 
        if (message == NULL) {
                MSAPI_DBG_ERR("g_dbus_message_new_signal failed");
-               return MS_MEDIA_ERR_SEND_NOTI_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        /* Send the signal */
@@ -109,7 +109,7 @@ int media_db_update_send_internal(int pid, /* mandatory */
                        g_object_unref(bus);
                        g_error_free(error);
                }
-               return MS_MEDIA_ERR_SEND_NOTI_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
 

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index 80210ce..adfd02d 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -125,7 +125,7 @@ int ms_load_functions(void)
        func_handle = dlopen(CONFIG_PATH, RTLD_LAZY);
        if (!func_handle) {
                MS_DBG_ERR("%s", dlerror());
-               return MS_MEDIA_ERR_DYNAMIC_LINK;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        dlerror();      /* Clear any existing error */
@@ -146,7 +146,7 @@ int ms_load_functions(void)
                        MS_SAFE_FREE(func_array);
                        dlclose(func_handle);
 
-                       return MS_MEDIA_ERR_DYNAMIC_LINK;
+                       return MS_MEDIA_ERR_INTERNAL;
                }
        }
 

diff --git a/src/common/media-common-external-storage.c b/src/common/media-common-external-storage.c
index 36842bd..014d55d 100755 (executable)
--- a/src/common/media-common-external-storage.c
+++ b/src/common/media-common-external-storage.c
@@ -121,7 +121,7 @@ int ms_write_device_info(const char *root_path, char *device_uuid)
                        MS_DBG_STRERROR("read-only mode");
                        return MS_MEDIA_ERR_NONE;
                } else {
-                       return MS_MEDIA_ERR_FILE_OPEN_FAIL;
+                       return MS_MEDIA_ERR_INTERNAL;
                }
        }
 

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index bca5608..28e3205 100755 (executable)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -425,42 +425,34 @@ bool ms_storage_mount_status(const char* start_path)
 
 int ms_set_db_status(ms_db_status_type_t status, ms_user_storage_type_e storage_type)
 {
-       int res = MS_MEDIA_ERR_NONE;
-       int err = 0;
+       int ret = MS_MEDIA_ERR_NONE;
 
        if (status == MS_DB_UPDATING) {
-               if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATING)) {
-                       res = MS_MEDIA_ERR_VCONF_SET_FAIL;
-                       MS_DBG_ERR("ms_config_set_int failed");
-               }
+               if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATING))
+                               goto ERROR;
 
                if (storage_type == MS_USER_STORAGE_EXTERNAL) {
-                       if (!ms_config_set_int(VCONFKEY_FILEMANAGER_MMC_STATUS, VCONFKEY_FILEMANAGER_MMC_LOADING)) {
-                               res = MS_MEDIA_ERR_VCONF_SET_FAIL;
-                               MS_DBG_ERR("ms_config_set_int failed");
-                       }
+                       if (!ms_config_set_int(VCONFKEY_FILEMANAGER_MMC_STATUS, VCONFKEY_FILEMANAGER_MMC_LOADING))
+                               goto ERROR;
                }
        } else {
-               if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED)) {
-                       res = MS_MEDIA_ERR_VCONF_SET_FAIL;
-                       MS_DBG_ERR("ms_config_set_int failed");
-               }
+               if (!ms_config_set_int(VCONFKEY_FILEMANAGER_DB_STATUS, VCONFKEY_FILEMANAGER_DB_UPDATED))
+                               goto ERROR;
 
                if (storage_type == MS_USER_STORAGE_EXTERNAL) {
-                       if (!ms_config_set_int(VCONFKEY_FILEMANAGER_MMC_STATUS, VCONFKEY_FILEMANAGER_MMC_LOADED)) {
-                               res = MS_MEDIA_ERR_VCONF_SET_FAIL;
-                               MS_DBG_ERR("ms_config_set_int failed");
-                       }
+                       if (!ms_config_set_int(VCONFKEY_FILEMANAGER_MMC_STATUS, VCONFKEY_FILEMANAGER_MMC_LOADED))
+                               goto ERROR;
                }
        }
 
-       err = ms_set_power_mode(status);
-       if (err != MS_MEDIA_ERR_NONE) {
+       ret = ms_set_power_mode(status);
+       if (ret != MS_MEDIA_ERR_NONE)
                MS_DBG_ERR("ms_set_power_mode fail");
-               res = err;
-       }
 
-       return res;
+       return ret;
+ERROR:
+       MS_DBG_ERR("ms_config_set_int failed");
+       return MS_MEDIA_ERR_INTERNAL;
 }
 
 int ms_set_power_mode(ms_db_status_type_t status)

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index 426ea2a..c9af5ed 100755 (executable)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -150,7 +150,7 @@ int __msc_folder_bulk_extract(sqlite3 *handle, const char* storage_id, int stora
                g_mutex_unlock(&decode_mutex);
                if (tmp_ret == MS_MEDIA_ERR_NONE)
                        extract_count++;
-               else if (tmp_ret == MS_MEDIA_ERR_FILE_IO)
+               else if (tmp_ret == MS_MEDIA_ERR_INTERNAL)
                        (*io_err_count)++;
 
                if (db_data) {
@@ -840,7 +840,7 @@ static int __msc_extract_set_db_status(ms_db_status_type_t status)
        //int err = 0;
 
        if (!ms_config_set_int(VCONFKEY_PRIVATE_EXTRACTSTATUS, status)) {
-               res = MS_MEDIA_ERR_VCONF_SET_FAIL;
+               res = MS_MEDIA_ERR_INTERNAL;
                MS_DBG_ERR("ms_config_set_int failed");
        }
 

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index a0ec099..6831b4f 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -482,7 +482,7 @@ static int __msc_dir_scan_for_folder(sqlite3 *handle, const char *storage_id, co
                                        ret = ms_scan_validate_item(handle, storage_id, path, uid);
                                        if (ret != MS_MEDIA_ERR_NONE) {
                                                MS_DBG_ERR("failed to update db : %d", ret);
-                                               if (ret == MS_MEDIA_ERR_FILE_IO)
+                                               if (ret == MS_MEDIA_ERR_INTERNAL)
                                                        MS_DBG_ERR("I/O ERROR COUNT[%d]", io_err_folder++);
 
                                                bpos += d->d_reclen;
@@ -780,7 +780,7 @@ static int __msc_dir_scan_for_storage(sqlite3 *handle, const char *storage_id, c
                                        ret = scan_function(handle, storage_id, path, uid);
                                        if (ret != MS_MEDIA_ERR_NONE) {
                                                MS_DBG_ERR("failed to update db : %d", scan_type);
-                                               if (ret == MS_MEDIA_ERR_FILE_IO)
+                                               if (ret == MS_MEDIA_ERR_INTERNAL)
                                                        MS_DBG_ERR("I/O ERROR COUNT[%d]", io_err_storage++);
 
                                                bpos += d->d_reclen;
@@ -1560,7 +1560,7 @@ static int __msc_make_file_list(char *file_path, GArray **path_array, uid_t uid)
        fp = fopen(file_path, "rt");
        if (fp == NULL) {
                MS_DBG_STRERROR("fopen failed");
-               res = MS_MEDIA_ERR_FILE_OPEN_FAIL;
+               res = MS_MEDIA_ERR_INTERNAL;
                goto FREE_RESOURCE;
        }
 

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index 76b4d54..0e2119e 100755 (executable)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -158,7 +158,7 @@ gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer d
        if (err < 0) {
                MS_DBG_STRERROR("fifo read failed");
                MS_SAFE_FREE(recv_msg);
-               return MS_MEDIA_ERR_FILE_READ_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        if (strlen(recv_msg->msg) == 0 || strlen(recv_msg->msg) >= MAX_MSG_SIZE) {
@@ -233,7 +233,7 @@ int msc_send_ready(void)
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
        if (fd < 0) {
                MS_DBG_STRERROR("fifo read failed");
-               return MS_MEDIA_ERR_FILE_OPEN_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        /* send ready message */
@@ -244,7 +244,7 @@ int msc_send_ready(void)
        err = write(fd, &send_msg, sizeof(send_msg));
        if (err < 0) {
                MS_DBG_STRERROR("fifo write failed");
-               res = MS_MEDIA_ERR_FILE_READ_FAIL;
+               res = MS_MEDIA_ERR_INTERNAL;
        }
 
        close(fd);
@@ -268,7 +268,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
        if (fd < 0) {
                MS_DBG_STRERROR("fifo open failed");
-               return MS_MEDIA_ERR_FILE_OPEN_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        /* send result message */
@@ -287,7 +287,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        err = write(fd, &send_msg, sizeof(send_msg));
        if (err < 0) {
                MS_DBG_STRERROR("fifo write failed");
-               res = MS_MEDIA_ERR_FILE_READ_FAIL;
+               res = MS_MEDIA_ERR_INTERNAL;
        }
 
        close(fd);
@@ -314,7 +314,7 @@ int msc_send_result_partial(int result, ms_msg_type_e msg_type, int pid, const c
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
        if (fd < 0) {
                MS_DBG_STRERROR("fifo open failed");
-               return MS_MEDIA_ERR_FILE_OPEN_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        /* send result message */
@@ -328,7 +328,7 @@ int msc_send_result_partial(int result, ms_msg_type_e msg_type, int pid, const c
        err = write(fd, &send_msg, sizeof(send_msg));
        if (err < 0) {
                MS_DBG_STRERROR("fifo write failed");
-               res = MS_MEDIA_ERR_FILE_READ_FAIL;
+               res = MS_MEDIA_ERR_INTERNAL;
        }
 
        close(fd);

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index ff206c6..81f2a2c 100755 (executable)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -247,7 +247,7 @@ int main(int argc, char **argv)
        fd = open(MS_SCANNER_FIFO_PATH_REQ, O_RDWR);
        if (fd < 0) {
                MS_DBG_STRERROR("fifo open failed");
-               return MS_MEDIA_ERR_FILE_OPEN_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        if (!ms_config_set_int(MSC_VCONF_KEY_SCANNER_POWEROFF_STATUS, 0))

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 989252b..8dcf6f7 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -450,7 +450,7 @@ static int __msc_make_file_list(char *file_path, GPtrArray **path_array, uid_t u
 
        /* load the file list from file */
        fp = fopen(file_path, "rt");
-       MS_DBG_RETVM_IF(!fp, MS_MEDIA_ERR_FILE_OPEN_FAIL, "fopen failed");
+       MS_DBG_RETVM_IF(!fp, MS_MEDIA_ERR_INTERNAL, "fopen failed");
 
        memset(buf, 0x0, MS_FILE_PATH_LEN_MAX);
        /* This is an array for storing the path of insert datas*/

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index f085b14..1af79ed 100755 (executable)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -106,7 +106,7 @@ int msc_send_ready(void)
        int fd = -1;
 
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
-       MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_FILE_OPEN_FAIL, "fifo open failed");
+       MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_INTERNAL, "fifo open failed");
 
        /* send ready message */
        memset(&send_msg, 0, sizeof(send_msg));
@@ -115,7 +115,7 @@ int msc_send_ready(void)
        /* send ready message */
        if (write(fd, &send_msg, sizeof(send_msg)) < 0) {
                MS_DBG_STRERROR("fifo write failed");
-               ret = MS_MEDIA_ERR_FILE_READ_FAIL;
+               ret = MS_MEDIA_ERR_INTERNAL;
        }
 
        close(fd);
@@ -130,7 +130,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        int fd = -1;
 
        fd = open(MS_SCANNER_FIFO_PATH_RES, O_WRONLY);
-       MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_FILE_OPEN_FAIL, "fifo open failed");
+       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));
@@ -143,7 +143,7 @@ int msc_send_result(int result, ms_comm_msg_s *res_data)
        /* send ready message */
        if (write(fd, &send_msg, sizeof(send_msg)) < 0) {
                MS_DBG_STRERROR("fifo write failed");
-               ret = MS_MEDIA_ERR_FILE_READ_FAIL;
+               ret = MS_MEDIA_ERR_INTERNAL;
        }
 
        close(fd);

diff --git a/src/scanner/media-scanner.c b/src/scanner/media-scanner.c
index 479d195..b8a1c37 100755 (executable)
--- a/src/scanner/media-scanner.c
+++ b/src/scanner/media-scanner.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
        fd = open(MS_SCANNER_FIFO_PATH_REQ, O_RDWR);
        if (fd < 0) {
                MS_DBG_STRERROR("fifo open failed");
-               return MS_MEDIA_ERR_FILE_OPEN_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        context = g_main_loop_get_context(scanner_mainloop);

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 3c18eac..25bba4c 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -254,7 +254,7 @@ int ms_write_media_server_status(void)
        fp = fopen(path, "wt");
        if (fp == NULL) {
                MS_DBG_ERR("fp is NULL. file name : %s", path);
-               return MS_MEDIA_ERR_FILE_OPEN_FAIL;
+               return MS_MEDIA_ERR_INTERNAL;
        }
 
        if (fputs(status, fp) < 0) {

diff --git a/src/server/media-server-scanner.c b/src/server/media-server-scanner.c
index 2d652e2..90b50c1 100755 (executable)
--- a/src/server/media-server-scanner.c
+++ b/src/server/media-server-scanner.c
@@ -237,7 +237,7 @@ int ms_scanner_start(void)
                fd = open(MS_SCANNER_FIFO_PATH_RES, O_RDWR);
                if (fd < 0) {
                        MS_DBG_STRERROR("fifo open failed");
-                       return MS_MEDIA_ERR_FILE_OPEN_FAIL;
+                       return MS_MEDIA_ERR_INTERNAL;
                }
 
                /* read() is blocked until media scanner sends message */
@@ -245,7 +245,7 @@ int ms_scanner_start(void)
                if (err < 0) {
                        MS_DBG_STRERROR("fifo read failed");
                        close(fd);
-                       return MS_MEDIA_ERR_FILE_READ_FAIL;
+                       return MS_MEDIA_ERR_INTERNAL;
                }
 
                scanner_status = recv_msg.msg_type;
@@ -276,7 +276,7 @@ int ms_scanner_start(void)
                        ret = MS_MEDIA_ERR_NONE;
                } else {
                        MS_DBG_ERR("SCANNER is not ready");
-                       ret = MS_MEDIA_ERR_SCANNER_NOT_READY;
+                       ret = MS_MEDIA_ERR_INTERNAL;
                        close(fd);
                }
 

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 8c9c9ee..2be9423 100755 (executable)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -293,12 +293,12 @@ static int __ms_send_request(ms_comm_msg_s *send_msg)
        int err = -1;
 
        fd = open(MS_SCANNER_FIFO_PATH_REQ, O_WRONLY|O_NONBLOCK);
-       MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_FILE_OPEN_FAIL, "fifo open failed");
+       MS_DBG_RETVM_IF(fd < 0, MS_MEDIA_ERR_INTERNAL, "fifo open failed");
 
        /* send message */
        err = write(fd, send_msg, sizeof(ms_comm_msg_s));
        close(fd);
-       MS_DBG_RETVM_IF(err < 0, MS_MEDIA_ERR_FILE_READ_FAIL, "fifo write failed");
+       MS_DBG_RETVM_IF(err < 0, MS_MEDIA_ERR_INTERNAL, "fifo write failed");
 
        ms_req_num++;