Sync code with Tizen 3.0 branch

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

diff --git a/src/mtp_event_handler.c b/src/mtp_event_handler.c
index ccab66a..fa549c8 100755 (executable)
--- a/src/mtp_event_handler.c
+++ b/src/mtp_event_handler.c
@@ -168,10 +168,10 @@ mtp_bool _eh_handle_usb_events(mtp_uint32 type)
                        DBG("USB disconnected but temp file is remaind.\
                                        It will be deleted.");
 
-                       if (g_mgr->ftemp_st.fhandle != INVALID_FILE) {
+                       if (g_mgr->ftemp_st.fhandle != NULL) {
                                DBG("handle is found. At first close file");
                                _util_file_close(g_mgr->ftemp_st.fhandle);
-                               g_mgr->ftemp_st.fhandle = INVALID_FILE;
+                               g_mgr->ftemp_st.fhandle = NULL;
                        }
                        if (remove(g_mgr->ftemp_st.filepath) < 0) {
                                ERR_SECURE("remove(%s) Fail", g_mgr->ftemp_st.filepath);
@@ -261,7 +261,7 @@ static void *__thread_event_handler(void *arg)
        while (flag) {
                mtp_int32 status = 0;
                status = read(g_pipefd[0], &evt, sizeof(mtp_event_t));
-               if(( status== -1) && errno == EINTR) {
+               if ((status == -1) && errno == EINTR) {
                        ERR("read() Fail");
                        continue;
                }
@@ -380,9 +380,8 @@ void _handle_lock_status_notification(keynode_t *key, void *data)
        previous_val = _util_get_local_lock_status();
        _util_get_lock_status(&current_val);
 
-       if (previous_val == current_val) {
+       if (previous_val == current_val)
                return;
-       }
 
        _util_set_local_lock_status(current_val);
 
@@ -450,7 +449,7 @@ void _eh_send_event_req_to_eh_thread(event_code_t action, mtp_ulong param1,
        DBG("action[%d], param1[%ld], param2[%ld]\n", action, param1, param2);
 
        status = write(g_pipefd[1], &event, sizeof(mtp_event_t));
-       if(status== -1 || errno == EINTR) {
+       if (status == -1 || errno == EINTR) {
                ERR("Event write over pipe Fail, status = [%d], pipefd = [%d], errno [%d]\n",
                                status, g_pipefd[1], errno);
        }
@@ -470,7 +469,7 @@ static mtp_bool __send_start_event_to_eh_thread(void)
        DBG("Action : START MTP OPERATION");
 
        status = write(g_pipefd[1], &event, sizeof(mtp_event_t));
-       if(status== -1 || errno == EINTR) {
+       if (status == -1 || errno == EINTR) {
                ERR("Event write over pipe Fail, status= [%d],pipefd = [%d], errno [%d]\n",
                                status, g_pipefd[1], errno);
                return FALSE;