make throws out the following errors.
emulator/hciemu.c: In function ‘hciemu_get_master_scan_enable’:
emulator/hciemu.c:433:3: error: return makes integer from pointer without a cast [-Werror]
return NULL;
^
emulator/hciemu.c: In function ‘hciemu_get_master_le_scan_enable’:
emulator/hciemu.c:441:3: error: return makes integer from pointer without a cast [-Werror]
return NULL;
^
cc1: all warnings being treated as errors
Fixed by returning zero.
---
emulator/hciemu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/emulator/hciemu.c b/emulator/hciemu.c
index c8d9db5..6a53499 100644
--- a/emulator/hciemu.c
+++ b/emulator/hciemu.c
@@ -430,7 +430,7 @@ const uint8_t *hciemu_get_client_bdaddr(struct hciemu *hciemu)
uint8_t hciemu_get_master_scan_enable(struct hciemu *hciemu)
{
if (!hciemu || !hciemu->master_dev)
- return NULL;
+ return 0;
return btdev_get_scan_enable(hciemu->master_dev);
}
@@ -438,7 +438,7 @@ uint8_t hciemu_get_master_scan_enable(struct hciemu *hciemu)
uint8_t hciemu_get_master_le_scan_enable(struct hciemu *hciemu)
{
if (!hciemu || !hciemu->master_dev)
- return NULL;
+ return 0;
return btdev_get_le_scan_enable(hciemu->master_dev);
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
