diff options
author | Archie Pusaka <apusaka@chromium.org> | 2021-09-15 16:31:56 +0800 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2021-09-21 10:51:53 +0200 |
commit | a777d7d5351923e1e832f19c6475ce91180ffec1 (patch) | |
tree | fb52f57381bab63231cf4a652f653bd6021610b5 /btio/btio.c | |
parent | b7d6a7d25628e9b521a29a5c133fcadcedeb2102 (diff) | |
download | bluez-a777d7d5351923e1e832f19c6475ce91180ffec1.tar.gz |
btio: Inclusive language changes
BT core spec 5.3 promotes the usage of inclusive languages.
This CL uses "central" as it is deemed to be more appropriate.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'btio/btio.c')
-rw-r--r-- | btio/btio.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/btio/btio.c b/btio/btio.c index 1f1c374bc..f4f53574c 100644 --- a/btio/btio.c +++ b/btio/btio.c @@ -61,7 +61,7 @@ struct set_opts { uint16_t mtu; uint16_t imtu; uint16_t omtu; - int master; + int central; uint8_t mode; int flushable; uint32_t priority; @@ -359,7 +359,7 @@ static int l2cap_connect(int sock, const bdaddr_t *dst, uint8_t dst_type, return 0; } -static int l2cap_set_master(int sock, int master) +static int l2cap_set_central(int sock, int central) { int flags; socklen_t len; @@ -368,7 +368,7 @@ static int l2cap_set_master(int sock, int master) if (getsockopt(sock, SOL_L2CAP, L2CAP_LM, &flags, &len) < 0) return -errno; - if (master) { + if (central) { if (flags & L2CAP_LM_MASTER) return 0; flags |= L2CAP_LM_MASTER; @@ -384,7 +384,7 @@ static int l2cap_set_master(int sock, int master) return 0; } -static int rfcomm_set_master(int sock, int master) +static int rfcomm_set_central(int sock, int central) { int flags; socklen_t len; @@ -393,7 +393,7 @@ static int rfcomm_set_master(int sock, int master) if (getsockopt(sock, SOL_RFCOMM, RFCOMM_LM, &flags, &len) < 0) return -errno; - if (master) { + if (central) { if (flags & RFCOMM_LM_MASTER) return 0; flags |= RFCOMM_LM_MASTER; @@ -656,7 +656,7 @@ static gboolean set_le_mode(int sock, uint8_t mode, GError **err) static gboolean l2cap_set(int sock, uint8_t src_type, int sec_level, uint16_t imtu, uint16_t omtu, uint8_t mode, - int master, int flushable, uint32_t priority, + int central, int flushable, uint32_t priority, GError **err) { if (imtu || omtu || mode) { @@ -676,8 +676,8 @@ static gboolean l2cap_set(int sock, uint8_t src_type, int sec_level, return ret; } - if (master >= 0 && l2cap_set_master(sock, master) < 0) { - ERROR_FAILED(err, "l2cap_set_master", errno); + if (central >= 0 && l2cap_set_central(sock, central) < 0) { + ERROR_FAILED(err, "l2cap_set_central", errno); return FALSE; } @@ -733,13 +733,13 @@ static int rfcomm_connect(int sock, const bdaddr_t *dst, uint8_t channel) return 0; } -static gboolean rfcomm_set(int sock, int sec_level, int master, GError **err) +static gboolean rfcomm_set(int sock, int sec_level, int central, GError **err) { if (sec_level && !set_sec_level(sock, BT_IO_RFCOMM, sec_level, err)) return FALSE; - if (master >= 0 && rfcomm_set_master(sock, master) < 0) { - ERROR_FAILED(err, "rfcomm_set_master", errno); + if (central >= 0 && rfcomm_set_central(sock, central) < 0) { + ERROR_FAILED(err, "rfcomm_set_central", errno); return FALSE; } @@ -828,7 +828,7 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err, /* Set defaults */ opts->type = BT_IO_SCO; opts->defer = DEFAULT_DEFER_TIMEOUT; - opts->master = -1; + opts->central = -1; opts->mode = L2CAP_MODE_BASIC; opts->flushable = -1; opts->priority = 0; @@ -889,8 +889,8 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err, if (!opts->mtu) opts->mtu = opts->imtu; break; - case BT_IO_OPT_MASTER: - opts->master = va_arg(args, gboolean); + case BT_IO_OPT_CENTRAL: + opts->central = va_arg(args, gboolean); break; case BT_IO_OPT_MODE: opts->mode = va_arg(args, int); @@ -1171,7 +1171,7 @@ parse_opts: case BT_IO_OPT_IMTU: *(va_arg(args, uint16_t *)) = l2o.imtu; break; - case BT_IO_OPT_MASTER: + case BT_IO_OPT_CENTRAL: len = sizeof(flags); if (getsockopt(sock, SOL_L2CAP, L2CAP_LM, &flags, &len) < 0) { @@ -1336,7 +1336,7 @@ static gboolean rfcomm_get(int sock, GError **err, BtIOOption opt1, *(va_arg(args, uint8_t *)) = dst.rc_channel; break; - case BT_IO_OPT_MASTER: + case BT_IO_OPT_CENTRAL: len = sizeof(flags); if (getsockopt(sock, SOL_RFCOMM, RFCOMM_LM, &flags, &len) < 0) { @@ -1484,7 +1484,7 @@ static gboolean sco_get(int sock, GError **err, BtIOOption opt1, va_list args) case BT_IO_OPT_DEST_CHANNEL: case BT_IO_OPT_PSM: case BT_IO_OPT_CID: - case BT_IO_OPT_MASTER: + case BT_IO_OPT_CENTRAL: case BT_IO_OPT_MODE: case BT_IO_OPT_FLUSHABLE: case BT_IO_OPT_PRIORITY: @@ -1578,10 +1578,10 @@ gboolean bt_io_set(GIOChannel *io, GError **err, BtIOOption opt1, ...) switch (type) { case BT_IO_L2CAP: return l2cap_set(sock, opts.src_type, opts.sec_level, opts.imtu, - opts.omtu, opts.mode, opts.master, + opts.omtu, opts.mode, opts.central, opts.flushable, opts.priority, err); case BT_IO_RFCOMM: - return rfcomm_set(sock, opts.sec_level, opts.master, err); + return rfcomm_set(sock, opts.sec_level, opts.central, err); case BT_IO_SCO: return sco_set(sock, opts.mtu, opts.voice, err); case BT_IO_INVALID: @@ -1628,7 +1628,7 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts, goto failed; if (!l2cap_set(sock, opts->src_type, opts->sec_level, opts->imtu, opts->omtu, opts->mode, - opts->master, opts->flushable, opts->priority, + opts->central, opts->flushable, opts->priority, err)) goto failed; break; @@ -1641,7 +1641,7 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts, if (rfcomm_bind(sock, &opts->src, server ? opts->channel : 0, err) < 0) goto failed; - if (!rfcomm_set(sock, opts->sec_level, opts->master, err)) + if (!rfcomm_set(sock, opts->sec_level, opts->central, err)) goto failed; break; case BT_IO_SCO: |