2020-10-06 15:26:36

by Henrik Grimler

[permalink] [raw]
Subject: [PATCH BlueZ v2] tools: fix forgotten index->mgmt_index renaming in btmgmt.c

Commit 6523d168a7c1 ("tools/btmgmt: Port to use bt_shell") seem to
have missed this. When trying to compile bluez I get:

```
tools/btmgmt.c:1229:34: warning: implicitly declaring library function 'index' \
with type 'char *(const char *, int)' [-Wimplicit-function-declaration]
config_info_rsp, UINT_TO_PTR(index), NULL)) {
^
tools/btmgmt.c:1229:34: note: include the header <strings.h> or explicitly \
provide a declaration for 'index'
[...]
aarch64-linux-android-ld: tools/btmgmt.o: in function `cmd_config':
btmgmt.c:(.text+0x544): undefined reference to `index'
aarch64-linux-android-ld: btmgmt.c:(.text+0x548): undefined reference to `index'
```

Probably only happens on system (like android) where the obsolete
index function does not exist.

---
Changes in v2:
- Update commit message to make lint bot happy

tools/btmgmt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index b0b837d34..228f94efa 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -1213,7 +1213,7 @@ static void cmd_config(int argc, char **argv)
}

if (!mgmt_send(mgmt, MGMT_OP_READ_CONFIG_INFO, mgmt_index, 0, NULL,
- config_info_rsp, UINT_TO_PTR(index), NULL)) {
+ config_info_rsp, UINT_TO_PTR(mgmt_index), NULL)) {
error("Unable to send read_config_info cmd");
return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
--
2.28.0