From: Taejin Woo <tt.woo@samsung.com>
Date: Tue, 10 May 2016 07:30:25 +0000 (+0900)
Subject: Fix fail issue for 64bit
X-Git-Tag: submit/tizen/20160510.074251^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c13769cae58ceda1f0e7e4718cee0d814adb32f;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-agent.git

Fix fail issue for 64bit

:about mismatching casting type

Change-Id: I90efb0bbec4f37e1c1322453363c0f4843e5cd2c
Signed-off-by: Taejin Woo <tt.woo@samsung.com>
---

diff --git a/map-agent/bluetooth_map_email.c b/map-agent/bluetooth_map_email.c
index e5210f0..90a8d65 100644
--- a/map-agent/bluetooth_map_email.c
+++ b/map-agent/bluetooth_map_email.c
@@ -35,6 +35,9 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <stdlib.h>
+#ifdef ARCH64
+#include <stdint.h>
+#endif
 
 #define BT_MAIL_ID_MAX_LENGTH 50
 #define BT_MAP_TIMESTAMP_MAX_LEN 16
@@ -90,7 +93,11 @@ static void __bt_map_parse_moved_mails(char *inbuf, int *from_box_id,
 		inner_tok = g_strsplit_set(outer_tok[2], ",", -1);
 		if (g_strv_length(inner_tok) == 1) { // only one mail_id exists without ","
 			int mail_id = atoi(outer_tok[2]);
+#ifdef ARCH64
+			*mail_list = g_list_append(*mail_list, (void *)(uintptr_t) mail_id);
+#else
 			*mail_list = g_list_append(*mail_list, (void *) mail_id);
+#endif
 		} else {
 			int i;
 			for (i = 0; i < g_strv_length(inner_tok); ++i) {
@@ -98,7 +105,11 @@ static void __bt_map_parse_moved_mails(char *inbuf, int *from_box_id,
 					continue;
 				else {
 					int mail_id = atoi(inner_tok[i]);
+#ifdef ARCH64
+					*mail_list = g_list_prepend(*mail_list, (void *)(uintptr_t) mail_id);
+#else
 					*mail_list = g_list_prepend(*mail_list, (void *) mail_id);
+#endif
 				}
 			}
 		}
@@ -229,7 +240,11 @@ static void __bt_email_subscription_callback(GDBusConnection *connection,
 
 		if (mailbox_to->mailbox_type == EMAIL_MAILBOX_TYPE_TRASH) {
 			while (mail_ids) {
+#ifdef ARCH64
+				int mailid = (int)(uintptr_t)(void*) mail_ids->data;
+#else
 				int mailid = (int) mail_ids->data;
+#endif
 				char *old_folder;
 				DBG("Mail ID[%d]", mailid);
 				if (mailid == 0)
@@ -246,7 +261,11 @@ static void __bt_email_subscription_callback(GDBusConnection *connection,
 		} else if (mailbox_to->mailbox_type == EMAIL_MAILBOX_TYPE_SENTBOX
 				&& mailbox_from->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX) {
 			while (mail_ids) {
+#ifdef ARCH64
+				int mailid = (int)(uintptr_t)(void*) mail_ids->data;
+#else
 				int mailid = (int) mail_ids->data;
+#endif
 				DBG("Mail ID[%d]", mailid);
 				if (mailid == 0)
 					break;
@@ -388,7 +407,11 @@ static message_info_t *__bt_email_info_get(email_mail_list_item_t *email_struct,
 	email_info = g_new0(message_info_t, 1);
 
 	uid = _bt_add_id(email_struct->mail_id, BT_MAP_ID_EMAIL);
+#ifdef ARCH64
+	snprintf(email_handle, sizeof(email_handle), "%lx", uid);
+#else
 	snprintf(email_handle, sizeof(email_handle), "%llx", uid);
+#endif
 	DBG("******* MAP ID:%d, MailID:%d **********", uid, email_struct->mail_id);
 	email_info->handle = g_strdup(email_handle);
 
@@ -736,9 +759,11 @@ static char *__bt_prepare_email_bmseg(email_mail_data_t *mail_data)
 		DBG("BODY of the MESSAGE NOT FOUND");
 		buf = (char *)g_strdup("");
 	}
-
+#ifdef ARCH64
+	g_string_append_printf(msg, LENGTH, (int)(unsigned int)strlen(buf));
+#else
 	g_string_append_printf(msg, LENGTH, strlen(buf));
-
+#endif
 	g_string_append_printf(msg, MSG_BODY, buf);
 
 
diff --git a/map-agent/bluetooth_map_sms.c b/map-agent/bluetooth_map_sms.c
index a2b6878..79494cf 100644
--- a/map-agent/bluetooth_map_sms.c
+++ b/map-agent/bluetooth_map_sms.c
@@ -710,7 +710,11 @@ static char *__bt_prepare_msg_bmseg(msg_struct_t msg_info, gboolean attach,
 					MSG_MESSAGE_SMS_DATA_STR,
 					msg_body, BT_MAP_MSG_BODY_MAX);
 		if (ret == MSG_SUCCESS) {
+#ifdef ARCH64
+			g_string_append_printf(msg, LENGTH, (int)(unsigned int)strlen(msg_body));
+#else
 			g_string_append_printf(msg, LENGTH, strlen(msg_body));
+#endif
 			g_string_append_printf(msg, MSG_BODY, msg_body);
 		}
 	} else {
@@ -870,7 +874,11 @@ static message_info_t *__bt_message_info_get(msg_struct_t msg_struct_handle,
 	}
 
 	uid = _bt_add_id(msg_id, BT_MAP_ID_SMS);
+#ifdef ARCH64
+	snprintf(msg_handle, sizeof(msg_handle), "%lx", uid);
+#else
 	snprintf(msg_handle, sizeof(msg_handle), "%llx", uid);
+#endif
 	DBG("HANDLE: %s, MAP Id: %d, MSG ID:%d", msg_handle, uid, msg_id);
 	msg_info->handle = g_strdup(msg_handle);
 
diff --git a/packaging/bluetooth-agent.spec b/packaging/bluetooth-agent.spec
index ff1b9ee..286122a 100644
--- a/packaging/bluetooth-agent.spec
+++ b/packaging/bluetooth-agent.spec
@@ -52,6 +52,13 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 export CFLAGS="$CFLAGS -DTIZEN_MEDIA_ENHANCE"
 export CFLAGS="$CFLAGS -DTIZEN_BT_HFP_AG_ENABLE"
 
+%ifarch aarch64
+echo arch64
+export CFLAGS+=" -DARCH64"
+export CXXFLAGS+=" -DARCH64"
+export FFLAGS+=" -DARCH64"
+%endif
+
 %if "%{?profile}" == "wearable"
 export CFLAGS="$CFLAGS -DTIZEN_WEARABLE"
 export CFLAGS="$CFLAGS -DTIZEN_SUPPORT_LUNAR_DEVICE"