summaryrefslogtreecommitdiff
path: root/chip/nrf51
diff options
context:
space:
mode:
authorEvan Green <evgreen@chromium.org>2019-08-01 16:04:42 -0700
committerCommit Bot <commit-bot@chromium.org>2019-10-05 00:47:33 +0000
commita41fea6b7df1c83072140c0da9e07f09a8b032e4 (patch)
tree283880db1385c93420de304b410a3bccafa90971 /chip/nrf51
parent4a29d2ecf4392cb995548e8f174cc85bac8361c1 (diff)
downloadchrome-ec-a41fea6b7df1c83072140c0da9e07f09a8b032e4.tar.gz
printf: Fix up %p to %pP
In order to avoid landmines later with future extensions to %p, disallow %p by itself. The danger is that we'll have something like: printf("%pFOO", myptr), and then later will add a %pF extension, but miss this printf (maybe the string is split, maybe it's just missed). Missing a conversion during extension is worse than just seeing a print like <ptr_val>OO, since %pF likely reaches through the pointer and interprets its contents according to whatever F means. Convert existing uses of %p to %pP, so they're explicitly printing a pointer value, giving us flexibility to extend in the future. BUG=chromium:984041 TEST=make -j buildall BRANCH=None Cq-Depend:chrome-internal:1560879 Change-Id: I36a4bee8d41cb9a6139171f8de0d8f2f19468132 Signed-off-by: Evan Green <evgreen@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1730604 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'chip/nrf51')
-rw-r--r--chip/nrf51/bluetooth_le.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/chip/nrf51/bluetooth_le.c b/chip/nrf51/bluetooth_le.c
index 1c18a8a84f..6fe123ac4e 100644
--- a/chip/nrf51/bluetooth_le.c
+++ b/chip/nrf51/bluetooth_le.c
@@ -453,7 +453,7 @@ static int command_ble_adv(int argc, char **argv)
rv = ble_radio_init(BLE_ADV_ACCESS_ADDRESS, BLE_ADV_CRCINIT);
- CPRINTS("ADV @%p", &adv_packet);
+ CPRINTS("ADV @%pP", &adv_packet);
((uint32_t *)&addr)[0] = 0xA3A2A1A0 | type;
((uint32_t *)&addr)[1] = BLE_RANDOM_ADDR_MSBS_STATIC << 8 | 0x5A4;
@@ -527,7 +527,7 @@ static int command_ble_adv_scan(int argc, char **argv)
rv = radio_disable();
- CPRINTS("on_air payload rcvd %p", &rx_packet);
+ CPRINTS("on_air payload rcvd %pP", &rx_packet);
return rv;
}