diff options
author | Dominic Spill <dominicgs@gmail.com> | 2016-02-02 18:21:36 +0000 |
---|---|---|
committer | Dominic Spill <dominicgs@gmail.com> | 2016-02-02 18:21:36 +0000 |
commit | 9d7aef4b7f6fb81152fba5d9136f68114a7308d3 (patch) | |
tree | 3932f9b2f92447734cce7a18fdfb9db02c1559fd /host/libubertooth | |
parent | 78f48bc8ec2b84f3a1e0d561a518365ba4ab5494 (diff) | |
parent | b28d9fc13f951cc3ecb10d38f45daf017c60645d (diff) |
Merge pull request #148 from elli89/fix-btle-segfault
fix issue #147
Diffstat (limited to 'host/libubertooth')
-rw-r--r-- | host/libubertooth/src/ubertooth.c | 2 | ||||
-rw-r--r-- | host/libubertooth/src/ubertooth.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/libubertooth/src/ubertooth.c b/host/libubertooth/src/ubertooth.c index 4459ca2..d1a5799 100644 --- a/host/libubertooth/src/ubertooth.c +++ b/host/libubertooth/src/ubertooth.c @@ -1022,7 +1022,7 @@ ubertooth_t* ubertooth_init() return ut; } -uint8_t ubertooth_connect(ubertooth_t* ut, int ubertooth_device) +int ubertooth_connect(ubertooth_t* ut, int ubertooth_device) { int r = libusb_init(NULL); if (r < 0) { diff --git a/host/libubertooth/src/ubertooth.h b/host/libubertooth/src/ubertooth.h index 9577d46..e5166f9 100644 --- a/host/libubertooth/src/ubertooth.h +++ b/host/libubertooth/src/ubertooth.h @@ -75,7 +75,7 @@ typedef struct { void print_version(); void register_cleanup_handler(ubertooth_t* ut); ubertooth_t* ubertooth_init(); -uint8_t ubertooth_connect(ubertooth_t* ut, int ubertooth_device); +int ubertooth_connect(ubertooth_t* ut, int ubertooth_device); ubertooth_t* ubertooth_start(int ubertooth_device); void ubertooth_stop(ubertooth_t* ut); void ubertooth_set_timeout(ubertooth_t* ut, int seconds); |