[Bluez PATCH 45/62] tools/rfcomm: Inclusive language changes
From: Archie Pusaka <hidden>
Date: 2021-08-13 12:22:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Archie Pusaka <redacted> "central" is preferred, as reflected in the BT core spec 5.3. --- tools/rfcomm.c | 14 +++++++------- tools/rfcomm.rst | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/rfcomm.c b/tools/rfcomm.c
index 7ad7ca5ad6..51b397b6ef 100644
--- a/tools/rfcomm.c
+++ b/tools/rfcomm.c@@ -37,7 +37,7 @@ static int rfcomm_raw_tty = 0; static int auth = 0; static int encryption = 0; static int secure = 0; -static int master = 0; +static int central = 0; static int linger = 0; static char *rfcomm_state[] = {
@@ -434,7 +434,7 @@ static void cmd_listen(int ctl, int dev, bdaddr_t *bdaddr, int argc, char **argv } lm = 0; - if (master) + if (central) lm |= RFCOMM_LM_CENTRAL; if (auth) lm |= RFCOMM_LM_AUTH;
@@ -646,7 +646,7 @@ static void usage(void) "\t-A, --auth Enable authentication\n" "\t-E, --encrypt Enable encryption\n" "\t-S, --secure Secure connection\n" - "\t-M, --master Become the master of a piconet\n" + "\t-C, --central Become the central of a piconet\n" "\t-L, --linger [seconds] Set linger timeout\n" "\t-a Show all devices (default)\n" "\n");
@@ -668,7 +668,7 @@ static struct option main_options[] = { { "auth", 0, 0, 'A' }, { "encrypt", 0, 0, 'E' }, { "secure", 0, 0, 'S' }, - { "master", 0, 0, 'M' }, + { "central", 0, 0, 'C' }, { "linger", 1, 0, 'L' }, { 0, 0, 0, 0 } };
@@ -680,7 +680,7 @@ int main(int argc, char *argv[]) bacpy(&bdaddr, BDADDR_ANY); - while ((opt = getopt_long(argc, argv, "+i:rahAESML:", main_options, NULL)) != -1) { + while ((opt = getopt_long(argc, argv, "+i:rahAESCL:", main_options, NULL)) != -1) { switch(opt) { case 'i': if (strncmp(optarg, "hci", 3) == 0)
@@ -713,8 +713,8 @@ int main(int argc, char *argv[]) secure = 1; break; - case 'M': - master = 1; + case 'C': + central = 1; break; case 'L':
diff --git a/tools/rfcomm.rst b/tools/rfcomm.rst
index 3c1b8cd682..cd5daa674d 100644
--- a/tools/rfcomm.rst
+++ b/tools/rfcomm.rst@@ -47,7 +47,7 @@ OPTIONS -S Secure connection --M Become the master of a piconet +-C Become the central of a piconet -L <seconds> Set linger timeout
--
2.33.0.rc1.237.g0d66db33f3-goog