Prevent errno reset

'strerror_r' updates errno.
So moved down the log.

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

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index 2f9ea5e..f8c4717 100644 (file)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -225,29 +225,23 @@ int ms_ipc_request_recovery(uid_t uid)
        }
 
        /*Receive Response*/
-       int recv_msg_size = -1;
-       ms_comm_msg_s recv_msg;
+       ms_comm_msg_s recv_msg = { 0, };
 RETRY:
-       if ((recv_msg_size = recv(sockfd, &recv_msg, sizeof(recv_msg), 0)) < 0) {
-               MSAPI_DBG_STRERROR("recv failed");
-
-               if (errno == EINTR || errno == EWOULDBLOCK) {
-                       if (retry_count < MAX_RETRY_COUNT) {
-                               MSAPI_DBG_ERR("TIME OUT[%d]", retry_count);
-                               retry_count++;
-                               goto RETRY;
-                       }
+       if (recv(sockfd, &recv_msg, sizeof(recv_msg), 0) < 0) {
+               if ((errno == EINTR || errno == EWOULDBLOCK) && retry_count < MAX_RETRY_COUNT) {
+                       MSAPI_DBG_ERR("TIME OUT[%d]", retry_count);
+                       retry_count++;
+                       goto RETRY;
                }
+               MSAPI_DBG_STRERROR("recv failed");
                close(sockfd);
                return MS_MEDIA_ERR_IPC;
        }
 
        MSAPI_DBG("RECEIVE OK [%d]", recv_msg.result);
-       ret = recv_msg.result;
-
        close(sockfd);
 
-       return ret;
+       return recv_msg.result;
 }
 
 int ms_ipc_request_update_db(const char *request_msg, uid_t uid)
@@ -299,27 +293,21 @@ int ms_ipc_request_update_db(const char *request_msg, uid_t uid)
        }
 
        /*Receive Response*/
-       int recv_msg_size = -1;
        int recv_msg = -1;
 RETRY:
-       if ((recv_msg_size = recv(sockfd, &recv_msg, sizeof(recv_msg), 0)) < 0) {
-               MSAPI_DBG_STRERROR("recv failed");
-
-               if (errno == EINTR || errno == EWOULDBLOCK) {
-                       if (retry_count < MAX_RETRY_COUNT) {
-                               MSAPI_DBG_ERR("TIME OUT[%d]", retry_count);
-                               retry_count++;
-                               goto RETRY;
-                       }
+       if (recv(sockfd, &recv_msg, sizeof(recv_msg), 0) < 0) {
+               if ((errno == EINTR || errno == EWOULDBLOCK) && retry_count < MAX_RETRY_COUNT) {
+                       MSAPI_DBG_ERR("TIME OUT[%d]", retry_count);
+                       retry_count++;
+                       goto RETRY;
                }
+               MSAPI_DBG_STRERROR("recv failed");
                close(sockfd);
                return MS_MEDIA_ERR_IPC;
        }
 
        MSAPI_DBG("RECEIVE OK [%d]", recv_msg);
-       ret = recv_msg;
-
        close(sockfd);
 
-       return ret;
+       return recv_msg;
 }
\ No newline at end of file

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 431d6bb..aab63c1 100644 (file)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.5.10
+Version:    0.5.11
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0