michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Fix incorrect logging format specifiers

Browse source 
Fix compilation issues that show up if SYS_LOG is mapped to printk
instead of printf. Unlike printf, printk is annotated so that the
compiler catches incorrect format specifiers passed to it.

Change-Id: I4d6f635a0ed61de698727028ea8767dc0ef28bb1
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-12-06 19:21:12 +02:00 • committed by Anas Nashif
commit 9aafa973df
7 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/bluetooth/hci/h4.c
View file

@ -68,7 +68,7 @@ static int h4_read(struct device *uart, uint8_t *buf,
break;
}
BT_DBG("read %d remaining %d", rx, len - rx);
BT_DBG("read %d remaining %zu", rx, len - rx);
len -= rx;
total += rx;
buf += rx;

2
subsys/bluetooth/host/att.c
View file

@ -1770,7 +1770,7 @@ struct net_buf *bt_att_create_pdu(struct bt_conn *conn, uint8_t op, size_t len)
}
if (len + sizeof(op) > att->chan.tx.mtu) {
BT_WARN("ATT MTU exceeded, max %u, wanted %u",
BT_WARN("ATT MTU exceeded, max %u, wanted %zu",
att->chan.tx.mtu, len + sizeof(op));
return NULL;
}

6
subsys/bluetooth/host/conn.c
View file

@ -1359,9 +1359,9 @@ static int bt_hci_connect_le_cancel(struct bt_conn *conn)
int bt_conn_le_param_update(struct bt_conn *conn,
const struct bt_le_conn_param *param)
{
BT_DBG("conn %p features 0x%x params (%d-%d %d %d)", conn,
conn->le.features[0], param->interval_min, param->interval_max,
param->latency, param->timeout);
BT_DBG("conn %p features 0x%02x params (%d-%d %d %d)", conn,
conn->le.features[0][0], param->interval_min,
param->interval_max, param->latency, param->timeout);
/* Check if there's a need to update conn params */
if (conn->le.interval >= param->interval_min &&

4
subsys/bluetooth/host/l2cap.c
View file

@ -1190,7 +1190,7 @@ static struct net_buf *l2cap_alloc_frag(struct bt_l2cap_le_chan *chan)
return NULL;
}
BT_DBG("frag %p tailroom %u", frag, net_buf_tailroom(frag));
BT_DBG("frag %p tailroom %zu", frag, net_buf_tailroom(frag));
net_buf_frag_add(chan->_sdu, frag);
@ -1203,7 +1203,7 @@ static void l2cap_chan_le_recv_sdu(struct bt_l2cap_le_chan *chan,
struct net_buf *frag;
uint16_t len;
BT_DBG("chan %p len %u sdu %u", chan, buf->len,
BT_DBG("chan %p len %u sdu %zu", chan, buf->len,
net_buf_frags_len(chan->_sdu));
if (net_buf_frags_len(chan->_sdu) + buf->len > chan->_sdu_len) {

2
subsys/bluetooth/host/l2cap_br.c
View file

@ -956,7 +956,7 @@ static uint16_t l2cap_br_conf_opt_mtu(struct bt_l2cap_chan *chan,
/* Core 4.2 [Vol 3, Part A, 5.1] MTU payload length */
if (len != 2) {
BT_ERR("tx MTU length %u invalid", len);
BT_ERR("tx MTU length %zu invalid", len);
result = BT_L2CAP_CONF_REJECT;
goto done;
}

2
subsys/bluetooth/host/sdp.c
View file

@ -294,7 +294,7 @@ int bt_sdp_register_service(struct bt_sdp_record *service)
uint32_t handle = SDP_SERVICE_HANDLE_BASE;
if (!service) {
BT_ERR("No service record specified", service);
BT_ERR("No service record specified");
return 0;
}

2
subsys/bluetooth/host/smp.c
View file

@ -3655,7 +3655,7 @@ int bt_smp_sign_verify(struct bt_conn *conn, struct net_buf *buf)
cnt = sys_cpu_to_le32(keys->remote_csrk.cnt);
memcpy(net_buf_tail(buf) - sizeof(sig), &cnt, sizeof(cnt));
BT_DBG("Sign data len %u key %s count %u", buf->len - sizeof(sig),
BT_DBG("Sign data len %zu key %s count %u", buf->len - sizeof(sig),
bt_hex(keys->remote_csrk.val, 16), keys->remote_csrk.cnt);
err = smp_sign_buf(keys->remote_csrk.val, buf->data,