korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-02 00:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the case if device isn't found in the name cache

Browse Source
This commit is contained in:
Marcel Holtmann 2005-04-16 22:58:53 +00:00
parent 91ec718746
commit 12513fafd3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/hcitool.c
View File

@ -286,7 +286,7 @@ static int read_device_name(const bdaddr_t *local, const bdaddr_t *peer, char *n
char filename[PATH_MAX + 1], addr[18], str[249], *buf, *ptr;
bdaddr_t bdaddr;
struct stat st;
int fd, pos, err = 0;
int fd, pos, err = -ENOENT;
ba2str(local, addr);
snprintf(filename, PATH_MAX, "%s/%s/names", DEVPATH, addr);
@ -321,6 +321,7 @@ static int read_device_name(const bdaddr_t *local, const bdaddr_t *peer, char *n
if (!bacmp(&bdaddr, peer)) {
snprintf(name, 249, "%s", str);
err = 0;
break;
}
@ -534,7 +535,7 @@ static void cmd_scan(int dev_id, int argc, char **argv)
for (i = 0; i < num_rsp; i++) {
memset(name, 0, sizeof(name));
nc = read_device_name(&di.bdaddr, &(info+i)->bdaddr, name) < 0 ? 0 : 1;
nc = (read_device_name(&di.bdaddr, &(info+i)->bdaddr, name) == 0);
if (!extcls && !extinf && !extoui) {
ba2str(&(info+i)->bdaddr, addr);