summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--host/ubertooth-tools/src/ubertooth-follow.c6
-rw-r--r--host/ubertooth-tools/src/ubertooth-scan.c7
2 files changed, 7 insertions, 6 deletions
diff --git a/host/ubertooth-tools/src/ubertooth-follow.c b/host/ubertooth-tools/src/ubertooth-follow.c
index d3a4d01..dec6c2e 100644
--- a/host/ubertooth-tools/src/ubertooth-follow.c
+++ b/host/ubertooth-tools/src/ubertooth-follow.c
@@ -55,7 +55,7 @@ static void usage()
int main(int argc, char *argv[])
{
- int opt, sock, dev_id, lap = 0, uap = 0, delay = 5;
+ int opt, sock, dev_id, rv, lap = 0, uap = 0, delay = 5;
int have_lap = 0;
int have_uap = 0;
int afh_enabled = 0;
@@ -226,8 +226,8 @@ int main(int argc, char *argv[])
return 1;
}
- r = ubertooth_check_api(ut);
- if (r < 0)
+ rv = ubertooth_check_api(ut);
+ if (rv < 0)
return 1;
cmd_set_bdaddr(ut->devh, btbb_piconet_get_bdaddr(pn));
diff --git a/host/ubertooth-tools/src/ubertooth-scan.c b/host/ubertooth-tools/src/ubertooth-scan.c
index 502d2ba..9cd59f9 100644
--- a/host/ubertooth-tools/src/ubertooth-scan.c
+++ b/host/ubertooth-tools/src/ubertooth-scan.c
@@ -181,7 +181,8 @@ void print_name_and_class(int dev_handle, int dev_id, bdaddr_t *bdaddr,
int main(int argc, char *argv[])
{
inquiry_info *ii = NULL;
- int i, opt, dev_id, dev_handle, len, flags, max_rsp, num_rsp, lap, timeout = 20;
+ int i, rv, opt, dev_id, dev_handle, len, flags;
+ int max_rsp, num_rsp, lap, timeout = 20;
uint8_t uap, extended = 0;
uint8_t scan = 0;
char ubertooth_device = -1;
@@ -239,8 +240,8 @@ int main(int argc, char *argv[])
usage();
return 1;
}
- r = ubertooth_check_api(ut);
- if (r < 0)
+ rv = ubertooth_check_api(ut);
+ if (rv < 0)
return 1;
/* Set sweep mode - otherwise AFH map is useless */