From ca2014965676620527077c65e482ea917331e5b1 Mon Sep 17 00:00:00 2001 From: Gowtham Anandha Babu Date: Mon, 16 Nov 2015 18:42:40 +0530 Subject: [PATCH] emulator/hciemu: Fix return value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 c8d9db51a..6a534990b 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); } -- 2.47.3