Code sync from tizen_2.4

Change-Id: Ic452099b4825405fc8f47378e6337c428994ba3d

diff --git a/packaging/tel-plugin-imcmodem.spec b/packaging/tel-plugin-imcmodem.spec
index 6bfd76d..7578c44 100644 (file)
--- a/packaging/tel-plugin-imcmodem.spec
+++ b/packaging/tel-plugin-imcmodem.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 10
+%define patchlevel 14
 
 Name:             tel-plugin-imcmodem
 Version:          %{major}.%{minor}.%{patchlevel}
@@ -39,6 +39,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 
 %files
 %manifest tel-plugin-imcmodem.manifest
-%defattr(-,root,root,-)
+%defattr(644,system,system,-)
 %{_libdir}/telephony/plugins/*
 /usr/share/license/%{name}

diff --git a/src/config.c b/src/config.c
index 8b96965..c3220e1 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -72,8 +72,7 @@
  * Channel 7 - MODEM & PS
  */
 unsigned int
-       supported_modules[IMC_CMUX_MAX_CHANNELS+1][MAX_CORE_OBJECTS_PER_CHANNEL] =
-{
+       supported_modules[IMC_CMUX_MAX_CHANNELS+1][MAX_CORE_OBJECTS_PER_CHANNEL] = {
        /*
         * Channel 0 - CMUX Control Channel
         * No Core Objects would be assigned to this channel
@@ -141,11 +140,10 @@ static void _assign_objects_to_hal(int channel_id, TcoreHal *hal, TcoreHal *phy_
                /* Add Core Object type for specific 'hal' */
                ret = tcore_server_add_cp_mapping_tbl_entry(modem,
                                supported_modules[channel_id][i], hal);
-               if (ret == TRUE) {
+               if (ret == TRUE)
                        dbg("Core Object Type: [0x%x] - Success");
-               } else {
+               else
                        err("Core Object Type: [0x%x] - Fail");
-               }
        }
 }
 
@@ -235,19 +233,17 @@ static void _on_response_enable_logging(TcorePending *p,
        TcoreHal *hal = user_data;
        TReturn ret;
 
-       if ((resp != NULL) && resp->success) {
+       if ((resp != NULL) && resp->success)
                dbg("Enable CP logging - [OK]");
-       } else {
+       else
                err("Enable CP logging - [NOK]");
-       }
 
        /* Initialize Internal MUX (CMUX) */
        ret = tcore_cmux_init(hal, 0, _on_response_cmux_init, hal);
-       if (ret != TCORE_RETURN_SUCCESS) {
+       if (ret != TCORE_RETURN_SUCCESS)
                err("Failed to initialize CMUX - Error: [0x%x]", ret);
-       } else {
+       else
                dbg("Successfully sent CMUX init to CP");
-       }
 }
 
 static void _on_timeout_check_cp_poweron(TcorePending *p, void *user_data)
@@ -346,6 +342,11 @@ static void _send_enable_logging_command(TcoreHal *hal)
        at_req = tcore_at_request_new(IMCMODEM_AT_CMD_XTRACE_ENABLE,
                                        NULL, TCORE_AT_NO_RESULT);
 
+       if (at_req  == NULL) {
+               tcore_pending_free(pending);
+               return;
+       }
+
        dbg("AT-Command: [%s] Prefix(if any): [%s] Command length: [%d]",
                at_req->cmd, at_req->prefix, strlen(at_req->cmd));
 
@@ -376,6 +377,11 @@ static gboolean _check_cp_poweron(TcoreHal *hal)
        /* Create AT Request */
        at_req = tcore_at_request_new("AT+CPAS", "+CPAS:", TCORE_AT_SINGLELINE);
 
+       if (at_req  == NULL) {
+               tcore_pending_free(pending);
+               return FALSE;
+       }
+
        dbg("AT-Command: [%s] Prefix(if any): [%s] Command length: [%d]",
                at_req->cmd, at_req->prefix, strlen(at_req->cmd));
 
@@ -412,9 +418,8 @@ void config_check_cp_power(TcoreHal *hal)
                return;
 
        ret = _check_cp_poweron(hal);
-       if (ret == TRUE) {
+       if (ret == TRUE)
                dbg("Successfully sent check CP Power ON command");
-       } else {
+       else
                err("Failed to send check CP Power ON command");
-       }
 }

diff --git a/src/imcmodem.c b/src/imcmodem.c
index d63f96b..ac7d0e7 100644 (file)
--- a/src/imcmodem.c
+++ b/src/imcmodem.c
@@ -219,7 +219,7 @@ static gboolean imcmodem_power_on(gpointer data)
        static int count = 0;
        dbg("Entry");
 
-       hal = (TcoreHal*)data;
+       hal = (TcoreHal *)data;
 
        custom_data = tcore_hal_ref_user_data(hal);
        if (custom_data == NULL) {
@@ -315,6 +315,8 @@ static gboolean _on_recv_ipc_message(GIOChannel *channel,
        char recv_buffer[IMC_BUFFER_LEN_MAX];
        int recv_len = 0;
        TReturn ret;
+       char buf[256];
+       const char *str = NULL;
 
        custom_data = tcore_hal_ref_user_data(hal);
        if (custom_data == NULL) {
@@ -333,7 +335,8 @@ static gboolean _on_recv_ipc_message(GIOChannel *channel,
        /* Receive data from device */
        recv_len = read(custom_data->ipc0.fd, (guchar *)recv_buffer, IMC_BUFFER_LEN_MAX);
        if (recv_len < 0) {
-               err("[READ] recv_len: [%d] Error: [%s]", recv_len,  strerror(errno));
+               str = strerror_r(errno, buf, 256);
+               err("[READ] recv_len: [%d] Error: [%s]", recv_len, str);
                return TRUE;
        }
 
@@ -380,13 +383,16 @@ static TReturn imcmodem_hal_setup_netif(CoreObject *co,
                int fd;
                char ifname[IMC_DEVICE_NAME_LEN_MAX];
                int ret = -1;
+               char buf[256];
+               const char *str = NULL;
 
                dbg("ACTIVATE");
 
                /* Open device to send IOCTL command */
                fd = open(VNET_CH_PATH_BOOT0, O_RDWR);
                if (fd < 0) {
-                       err("Failed to Open [%s] Error: [%s]", VNET_CH_PATH_BOOT0, strerror(errno));
+                       str = strerror_r(errno, buf, 256);
+                       err("Failed to Open [%s] Error: [%s]", VNET_CH_PATH_BOOT0, str);
                        return TCORE_RETURN_FAILURE;
                }
 

diff --git a/src/vnet.c b/src/vnet.c
index 967f14d..65b8f9f 100644 (file)
--- a/src/vnet.c
+++ b/src/vnet.c
@@ -125,18 +125,22 @@ int vnet_ipc0_open()
 {
        enum vnet_cp_state state;
        int fd;
+       char buf[256];
+       const char *str = NULL;
+
        dbg("Entry");
 
        /* Opening device to track CP state */
        fd = open(VNET_CH_PATH_BOOT0, O_RDWR);
        if (fd < 0) {
-               err("Failed to Open [%s] Error: [%s]", VNET_CH_PATH_BOOT0, strerror(errno));
+               str = strerror_r(errno, buf, 256);
+               err("Failed to Open [%s] Error: [%s]", VNET_CH_PATH_BOOT0, str);
                return -1;
        }
 
        /* Track the state of CP */
        state = vnet_get_cp_state(fd);
-       close (fd);
+       close(fd);
 
        dbg("CP State: [%d]", state);
        if (state != VNET_CP_STATE_ONLINE) {
@@ -147,7 +151,8 @@ int vnet_ipc0_open()
        /* Opening AP-CP Control communication device */
        fd = open(VNET_CH_PATH_IPC0, O_RDWR);
        if (fd < 0) {
-               err("Failed to Open [%s] Error: [%s]", VNET_CH_PATH_IPC0, strerror(errno));
+               str = strerror_r(errno, buf, 256);
+               err("Failed to Open [%s] Error: [%s]", VNET_CH_PATH_IPC0, str);
                return -1;
        }