diff options
| author | Gowtham Anandha Babu <gowtham.ab@samsung.com> | 2015-11-16 18:42:40 +0530 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-11-16 15:49:46 +0200 |
| commit | ca2014965676620527077c65e482ea917331e5b1 (patch) | |
| tree | 2483b1bae6dbf4d50b4d16f2bed147efeacdff36 | |
| parent | e5d47b64971abc7c826edae3945410a63b23ab61 (diff) | |
| download | bluez-ca2014965676620527077c65e482ea917331e5b1.tar.gz | |
emulator/hciemu: Fix return value
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.
| -rw-r--r-- | emulator/hciemu.c | 4 |
1 files 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); } |