From: DoHyun Pyun Date: Mon, 17 Dec 2018 09:06:03 +0000 (+0900) Subject: Fix dlog format error X-Git-Tag: submit/tizen/20181217.091427^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=faec5c067822e86c9f2861912de6c4881e23c96c;p=platform%2Fcore%2Fapi%2Fbluetooth.git Fix dlog format error Change-Id: Ia1120aaa47212e56f224c1596d53e32a846ca011 Signed-off-by: DoHyun Pyun --- diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c index 5204eea..875a855 100644 --- a/src/bluetooth-adapter.c +++ b/src/bluetooth-adapter.c @@ -361,7 +361,7 @@ int bt_adapter_get_local_info(char **chipset, char **firmware, buf[lsize] = '\0'; if (result != lsize) { - BT_ERR("fread() error(0x%x)", result); + BT_ERR("fread() error(0x%zd)", result); ret = BT_ERROR_OPERATION_FAILED; goto ERROR; } diff --git a/src/bluetooth-gatt.c b/src/bluetooth-gatt.c index 7e071bd..7c22bb1 100644 --- a/src/bluetooth-gatt.c +++ b/src/bluetooth-gatt.c @@ -2209,7 +2209,7 @@ int bt_gatt_characteristic_create(const char *uuid, int permissions, chr->type = BT_GATT_TYPE_CHARACTERISTIC; chr->role = BT_GATT_ROLE_SERVER; - BT_INFO("Characteristic UUID : [%s] len [%d] permissions [%d] properties [%d]", + BT_INFO("Characteristic UUID : [%s] len [%zd] permissions [%d] properties [%d]", uuid, strlen(uuid), permissions, properties); #ifdef TIZEN_FEATURE_GATT_RELAY @@ -2500,7 +2500,7 @@ int bt_gatt_descriptor_create(const char *uuid, int permissions, desc->type = BT_GATT_TYPE_DESCRIPTOR; desc->role = BT_GATT_ROLE_SERVER; - BT_INFO("Descriptor UUID : [%s] len [%d] permissions [%d]", uuid, strlen(uuid), permissions); + BT_INFO("Descriptor UUID : [%s] len [%zd] permissions [%d]", uuid, strlen(uuid), permissions); #ifdef TIZEN_FEATURE_GATT_RELAY desc->uuid = _bt_convert_uuid_to_uuid128(uuid); #else diff --git a/src/bluetooth-otp.c b/src/bluetooth-otp.c index ad1983c..2935897 100644 --- a/src/bluetooth-otp.c +++ b/src/bluetooth-otp.c @@ -1129,7 +1129,7 @@ static void __bt_otp_client_feature_response(bt_otp_client_s *otp_client_s, char (uint64_t)(value[6] & 0xFF) << 8 | (uint64_t)(value[7] & 0xFF); otp_client_s->otp_feature = feature; - BT_INFO("OTP Feature [%llu]", feature); + BT_INFO("OTP Feature [%llu]", (long long unsigned int)feature); if (BT_OTP_IS_OACP_SUPPORTED(otp_client_s->otp_feature) && !otp_client_s->oacp_cccd_enabled @@ -1399,7 +1399,7 @@ static void __bt_otp_client_id_response(bt_otp_client_s *otp_client_s, char *val (uint64_t)(value[2] & 0xFF) << 16 | (uint64_t)(value[1] & 0xFF) << 8 | (uint64_t)(value[0] & 0xFF); - BT_INFO("Object ID [%llu]", id); + BT_INFO("Object ID [%llu]", (long long unsigned int)id); /* TODO: Remove the previous stored object list */ if (otp_client_s->curr_op == BT_OTP_OBJECT_DISCOVERY) { @@ -1875,7 +1875,7 @@ void _bt_otp_client_indication(int result, bluetooth_otp_resp_info_t *info) (uint64_t)(info->data[3] & 0xFF) << 16 | (uint64_t)(info->data[2] & 0xFF) << 8 | (uint64_t)(info->data[1] & 0xFF); - BT_INFO("Changed occurred to object id %llu", id); + BT_INFO("Changed occurred to object id %llu", (long long unsigned int)id); return; } } @@ -1988,7 +1988,7 @@ int bt_otp_client_select_object(bt_otp_client_h otp_client, unsigned long long i return BT_ERROR_OPERATION_FAILED; } - BT_DBG("OTP client select object [%llu] from Remote device [%s]", id, otp_client_s->remote_address); + BT_DBG("OTP client select object [%llu] from Remote device [%s]", (long long unsigned int)id, otp_client_s->remote_address); otp_client_s->curr_op = BT_OTP_OBJECT_SELECT; otp_client_s->callback = callback; otp_client_s->user_data = user_data; @@ -2077,7 +2077,7 @@ static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond, return TRUE; } - BT_DBG("Received data length %d, remote_addr = %s", len, remote_addr); + BT_DBG("Received data length %zd, remote_addr = %s", len, remote_addr); if (!oacp_read_op) { char file_path[BT_FILE_PATH_MAX_LEN] = {0, }; @@ -2097,7 +2097,7 @@ static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond, object_info = _bt_otp_client_find_object(otp_client_s->object_list, obj_id); if (!object_info) { - BT_INFO("Object Not Found [%llu]", obj_id); + BT_INFO("Object Not Found [%llu]", (long long unsigned int)obj_id); goto fail; } @@ -2123,7 +2123,7 @@ static gboolean __client_data_received_cb(GIOChannel *chan, GIOCondition cond, if (oacp_read_op->length <= oacp_read_op->size) { written = fwrite(buffer, 1, len, oacp_read_op->fp); oacp_read_op->length += written; - BT_DBG("written [%d], length_sofar [%u], received_buff_len [%d], size [%u]", + BT_DBG("written [%d], length_sofar [%u], received_buff_len [%zd], size [%u]", written, oacp_read_op->length, len, oacp_read_op->size); } @@ -2347,11 +2347,11 @@ int bt_otp_client_read_object_contents(bt_otp_client_h otp_client, obj_id = otp_client_s->object_id; BT_DBG("OTP client Read objects Contents from Remote device [%s] for Object [%llu]", - otp_client_s->remote_address, obj_id); + otp_client_s->remote_address, (long long unsigned int)obj_id); object_info = _bt_otp_client_find_object(otp_client_s->object_list, obj_id); if (!object_info) { - BT_INFO("Object Not Found [%llu]", obj_id); + BT_INFO("Object Not Found [%llu]", (long long unsigned int)obj_id); return BT_ERROR_OPERATION_FAILED; } @@ -2378,7 +2378,7 @@ int bt_otp_client_read_object_contents(bt_otp_client_h otp_client, uint32_t length = object_info->curr_size; BT_INFO("Object ID [%llu],Offset [%u], Length [%u], curr_size [%u]", - obj_id, offset, length, object_info->curr_size); + (long long unsigned int)obj_id, offset, length, object_info->curr_size); uint8_t value[9] = {0x00}; value[0] = OACP_READ; @@ -2622,7 +2622,7 @@ int bt_otp_client_write_object(bt_otp_client_h otp_client, object_info = _bt_otp_client_find_object(otp_client_s->object_list, otp_client_s->object_id); if (!object_info) { - BT_INFO("Object Not Found [%llu]", otp_client_s->object_id); + BT_INFO("Object Not Found [%llu]", (long long unsigned int)otp_client_s->object_id); return BT_ERROR_OPERATION_FAILED; } @@ -2729,7 +2729,7 @@ int bt_otp_client_execute_object(bt_otp_client_h otp_client, object_info = _bt_otp_client_find_object(otp_client_s->object_list, otp_client_s->object_id); if (!object_info) { - BT_INFO("Object Not Found [%llu]", otp_client_s->object_id); + BT_INFO("Object Not Found [%llu]", (long long unsigned int)otp_client_s->object_id); return BT_ERROR_OPERATION_FAILED; } @@ -2739,7 +2739,7 @@ int bt_otp_client_execute_object(bt_otp_client_h otp_client, } BT_DBG("OTP client execute object [%llu] in Remote device [%s]", - otp_client_s->object_id, otp_client_s->remote_address); + (long long unsigned int)otp_client_s->object_id, otp_client_s->remote_address); otp_client_s->callback = callback; otp_client_s->user_data = user_data; @@ -2803,7 +2803,7 @@ int bt_otp_client_delete_object(bt_otp_client_h otp_client, object_info = _bt_otp_client_find_object(otp_client_s->object_list, otp_client_s->object_id); if (!object_info) { - BT_INFO("Object Not Found [%llu]", otp_client_s->object_id); + BT_INFO("Object Not Found [%llu]", (long long unsigned int)otp_client_s->object_id); return BT_ERROR_OPERATION_FAILED; } @@ -2813,7 +2813,7 @@ int bt_otp_client_delete_object(bt_otp_client_h otp_client, } BT_DBG("OTP client delete object [%llu] in Remote device [%s]", - otp_client_s->object_id, otp_client_s->remote_address); + (long long unsigned int)otp_client_s->object_id, otp_client_s->remote_address); otp_client_s->callback = callback; otp_client_s->user_data = user_data;