Fix 64-bit env potential issue

2nd parameter of g_base_decode() should be gsize type

Change-Id: I0e8d9ad45241b995f3d8e30d622704fd243ffa44

diff --git a/include/TelOem.h b/include/TelOem.h
index 0f4a5e9..b480039 100644 (file)
--- a/include/TelOem.h
+++ b/include/TelOem.h
@@ -54,7 +54,7 @@ typedef struct oem_data TelOemNotiData_t;
  */
 struct oem_data {
        unsigned int oem_id; /**< Oem ID */
-       unsigned int data_len; /**< Oem data length */
+       gsize data_len; /**< Oem data length */
        unsigned char *data; /**< Oem data */
 };
 

diff --git a/src/tapi_common.c b/src/tapi_common.c
index 419bf41..33b80db 100644 (file)
--- a/src/tapi_common.c
+++ b/src/tapi_common.c
@@ -1348,9 +1348,9 @@ static void _process_oem_event(const gchar *sig, GVariant *param,
                gchar *data = NULL;
 
                g_variant_get(param, "(is)", &oem_data.oem_id, &data);
-               oem_data.data = g_base64_decode((const gchar *)data, (gsize *)&oem_data.data_len);
+               oem_data.data = g_base64_decode((const gchar *)data, &oem_data.data_len);
                if (oem_data.data) {
-                       msg("[%s] id:[%d] len:[%d]", handle->cp_name, oem_data.oem_id, oem_data.data_len);
+                       msg("[%s] id:[%d] len:[%zu]", handle->cp_name, oem_data.oem_id, oem_data.data_len);
                        TAPI_INVOKE_NOTI_CALLBACK(&oem_data);
 
                        g_free(oem_data.data);

diff --git a/src/tapi_oem.c b/src/tapi_oem.c
index 05864a6..f725479 100644 (file)
--- a/src/tapi_oem.c
+++ b/src/tapi_oem.c
@@ -70,11 +70,11 @@ static void on_response_oem_data_async(GObject *source_object,
 
        g_variant_get(dbus_result, "(is)", &oem_data.oem_id, &data);
 
-       oem_data.data = g_base64_decode((const gchar *)data, (gsize *)&oem_data.data_len);
+       oem_data.data = g_base64_decode((const gchar *)data, &oem_data.data_len);
        if (oem_data.data) {
                result = TAPI_API_SUCCESS;
 
-               dbg("id:[0x%x] len:[%d]", oem_data.oem_id, oem_data.data_len);
+               dbg("id:[0x%x] len:[%zu]", oem_data.oem_id, oem_data.data_len);
 
                TAPI_INVOKE_RESP_CALLBACK(evt_cb_data, result, &oem_data);
 
@@ -173,9 +173,9 @@ EXPORT_API int tel_send_oem_data_sync(TapiHandle *handle, int oem_id,
 
        g_variant_get(rst, "(is)", &outparam->oem_id, &pdata);
 
-       outparam->data = g_base64_decode((const gchar *)pdata, (gsize *)&outparam->data_len);
+       outparam->data = g_base64_decode((const gchar *)pdata, &outparam->data_len);
        if (outparam->data_len)
-               dbg("id:[0x%x] len:[%d]", outparam->oem_id, outparam->data_len);
+               dbg("id:[0x%x] len:[%zu]", outparam->oem_id, outparam->data_len);
 
        g_free(pdata);
        g_variant_unref(rst);