Sync code with Tizen 3.0 branch

[platform/core/connectivity/mtp-responder.git] / src / transport / mtp_transport.c

diff --git a/src/transport/mtp_transport.c b/src/transport/mtp_transport.c
index 2e382c3..3eee08b 100755 (executable)
--- a/src/transport/mtp_transport.c
+++ b/src/transport/mtp_transport.c
@@ -66,14 +66,14 @@ void _transport_save_cmd_buffer(mtp_char *buffer, mtp_uint32 size)
 mtp_err_t _transport_rcv_temp_file_data(mtp_byte *buffer, mtp_uint32 size,
                mtp_uint32 *count)
 {
-       mtp_uint32 h_file = INVALID_FILE;
+       FILE* h_file = NULL;
        mtp_int32 error = 0;
        mtp_uint32 data_sz;
 
 
        h_file = _util_file_open(g_mgr->ftemp_st.filepath,
                        MTP_FILE_READ, &error);
-       if (h_file == INVALID_FILE) {
+       if (h_file == NULL) {
                DBG_SECURE("_util_file_open(%s) Fail", g_mgr->ftemp_st.filepath);
                return MTP_ERROR_NONE;
        }
@@ -133,7 +133,7 @@ mtp_err_t _transport_rcv_temp_file_info(mtp_byte *buf, char *filepath,
 
        g_strlcpy(g_mgr->ftemp_st.filepath, MTP_TEMP_FILE_DEFAULT,
                        MTP_MAX_PATHNAME_SIZE + 1);
-       g_mgr->ftemp_st.fhandle = INVALID_FILE;
+       g_mgr->ftemp_st.fhandle = NULL;
        g_mgr->ftemp_st.file_size = 0;
 
        return MTP_ERROR_NONE;
@@ -421,14 +421,12 @@ void _transport_usb_finalize(void)
                }
 
                res = _util_thread_join(g_data_rcv, &th_result);
-               if (res == FALSE) {
+               if (res == FALSE)
                        ERR("_util_thread_join(data_rcv) Fail");
-               }
        }
 
-       if (_transport_mq_deinit(&g_usb_to_mtp_mqid, &mtp_to_usb_mqid) == FALSE) {
+       if (_transport_mq_deinit(&g_usb_to_mtp_mqid, &mtp_to_usb_mqid) == FALSE)
                ERR("_transport_mq_deinit() Fail");
-       }
 
        _transport_deinit_usb_device();
 
@@ -442,7 +440,7 @@ static void *__transport_thread_data_rcv(void *func)
        mtp_uint32 pkt_len = 0;
        mtp_int32 flag = 1;
        mtp_int32 len = 0;
-       _cmd_handler_cb _cmd_handler_func = (_cmd_handler_cb )func;
+       _cmd_handler_cb _cmd_handler_func = (_cmd_handler_cb)func;
 
        while (flag) {
                if (_util_msgq_receive(g_usb_to_mtp_mqid, (void *)&pkt,