mbox series

[Bluez,v2,00/13] Inclusive language changes

Message ID 20210902040711.665952-1-apusaka@google.com (mailing list archive)
Headers show
Series Inclusive language changes | expand

Message

Archie Pusaka Sept. 2, 2021, 4:06 a.m. UTC
From: Archie Pusaka <apusaka@chromium.org>

Hi BlueZ maintainers,

This series of patches promotes the usage of the more inclusive terms
such as central/peripheral, accept list/reject list, or their
equivalent where appropriate.

This is also reflected on the changes to Core spec v5.3 and the
appropriate language mapping table by Bluetooth SIG
https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf

As you suggested, I dropped the Android changes and merge patches
which belong to the same directory into one patch. However I didn't
get a clear opinion on "storing LTK" patch which will break stored
data, so I separate that into its own patch.

I also don't know the scope of libbluetooth, so please advise me on
which terms shouldn't be changed yet, if any.

Thanks,
Archie

Changes in v2:
* Merging several patches from the same directory into one

Archie Pusaka (13):
  lib: Inclusive language changes
  btio: Inclusive language changes
  monitor: Inclusive language changes
  emulator: Inclusive language changes
  tools: Inclusive language changes
  plugins/sixaxis: Inclusive language changes
  profiles: Inclusive language changes
  src: Inclusive language changes
  client: Inclusive language changes
  mesh: Inclusive language changes
  unit/mesh: Inclusive language changes
  doc: Inclusive language update
  adapter: Inclusive language for storing LTK

 android/a2dp.c             |   2 +-
 android/bluetooth.c        |   4 +-
 android/handsfree-client.c |   2 +-
 android/tester-main.c      |   2 +-
 btio/btio.c                |  62 +++---
 btio/btio.h                |   2 +-
 client/main.c              |   6 +-
 doc/mesh-api.txt           |   2 +-
 doc/mgmt-api.txt           |   6 +-
 doc/settings-storage.txt   |   4 +-
 emulator/btdev.c           | 198 +++++++++---------
 emulator/hciemu.c          |  21 +-
 emulator/hciemu.h          |  12 +-
 emulator/le.c              | 116 +++++------
 emulator/serial.c          |   6 +-
 emulator/smp.c             |   8 +-
 lib/hci.c                  |  52 ++---
 lib/hci.h                  |  44 ++--
 lib/hci_lib.h              |   8 +-
 lib/l2cap.h                |   2 +-
 lib/mgmt.h                 |   2 +-
 lib/rfcomm.h               |   2 +-
 mesh/net-keys.c            |  38 ++--
 mesh/net-keys.h            |   8 +-
 mesh/net.h                 |   4 +-
 monitor/broadcom.c         |   8 +-
 monitor/bt.h               | 150 +++++++-------
 monitor/control.c          |  14 +-
 monitor/l2cap.c            |  10 +-
 monitor/ll.c               |  60 +++---
 monitor/lmp.c              |   2 +-
 monitor/packet.c           | 411 +++++++++++++++++++------------------
 plugins/sixaxis.c          |  44 ++--
 profiles/audio/a2dp.c      |   2 +-
 profiles/audio/avctp.c     |  10 +-
 profiles/audio/avctp.h     |   2 +-
 profiles/health/mcap.c     |  22 +-
 profiles/health/mcap.h     |   2 +-
 profiles/sap/server.c      |   2 +-
 src/adapter.c              | 117 ++++++-----
 src/adapter.h              |   4 +-
 src/device.c               |   6 +-
 src/sdpd-server.c          |  10 +-
 src/sdpd.h                 |   2 +-
 src/shared/ad.c            |   8 +-
 src/shared/ad.h            |   2 +-
 src/shared/hfp.c           |   4 +-
 src/shared/hfp.h           |   2 +-
 tools/3dsp.c               |  62 +++---
 tools/bdaddr.rst           |   2 +-
 tools/btiotest.c           |  22 +-
 tools/btpclientctl.c       |   2 +-
 tools/hci-tester.c         |  16 +-
 tools/hciconfig.c          |  26 +--
 tools/hciconfig.rst        |  24 +--
 tools/hcitool.c            | 110 +++++-----
 tools/hcitool.rst          |  30 +--
 tools/l2cap-tester.c       |  36 ++--
 tools/l2test.c             |  22 +-
 tools/mesh-cfgclient.c     |   4 +-
 tools/mesh-gatt/mesh-net.h |   4 +-
 tools/mesh-gatt/net.c      |  60 +++---
 tools/mesh/mesh-db.c       |  28 ++-
 tools/mesh/mesh-db.h       |   4 +-
 tools/mesh/remote.c        |  53 +++--
 tools/mesh/remote.h        |   5 +-
 tools/meshctl.c            |   6 +-
 tools/mgmt-tester.c        | 138 +++++++------
 tools/oobtest.c            |  12 +-
 tools/parser/avdtp.c       |   4 +-
 tools/parser/csr.c         |  17 +-
 tools/parser/ericsson.c    |   2 +-
 tools/parser/hci.c         |  49 ++---
 tools/parser/lmp.c         | 112 +++++-----
 tools/parser/parser.h      |   2 +-
 tools/parser/smp.c         |  12 +-
 tools/rctest.c             |  22 +-
 tools/rctest.rst           |   4 +-
 tools/rfcomm-tester.c      |  14 +-
 tools/rfcomm.c             |  16 +-
 tools/rfcomm.rst           |   2 +-
 tools/sco-tester.c         |  10 +-
 tools/smp-tester.c         |  16 +-
 unit/test-mesh-crypto.c    |   4 +-
 84 files changed, 1237 insertions(+), 1222 deletions(-)

Comments

Archie Pusaka Sept. 2, 2021, 4:50 a.m. UTC | #1
There are plenty of linter errors, but mostly it's only because I
replace a few characters on an already faulty line.
Fixing only the problematic lines would be bad because the structure
would not be consistent with the neighboring lines.
Should I also fix those linter errors on those lines and the
neighboring lines?

On Thu, 2 Sept 2021 at 12:07, Archie Pusaka <apusaka@google.com> wrote:
>
> From: Archie Pusaka <apusaka@chromium.org>
>
> Hi BlueZ maintainers,
>
> This series of patches promotes the usage of the more inclusive terms
> such as central/peripheral, accept list/reject list, or their
> equivalent where appropriate.
>
> This is also reflected on the changes to Core spec v5.3 and the
> appropriate language mapping table by Bluetooth SIG
> https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf
>
> As you suggested, I dropped the Android changes and merge patches
> which belong to the same directory into one patch. However I didn't
> get a clear opinion on "storing LTK" patch which will break stored
> data, so I separate that into its own patch.
>
> I also don't know the scope of libbluetooth, so please advise me on
> which terms shouldn't be changed yet, if any.
>
> Thanks,
> Archie
>
> Changes in v2:
> * Merging several patches from the same directory into one
>
> Archie Pusaka (13):
>   lib: Inclusive language changes
>   btio: Inclusive language changes
>   monitor: Inclusive language changes
>   emulator: Inclusive language changes
>   tools: Inclusive language changes
>   plugins/sixaxis: Inclusive language changes
>   profiles: Inclusive language changes
>   src: Inclusive language changes
>   client: Inclusive language changes
>   mesh: Inclusive language changes
>   unit/mesh: Inclusive language changes
>   doc: Inclusive language update
>   adapter: Inclusive language for storing LTK
>
>  android/a2dp.c             |   2 +-
>  android/bluetooth.c        |   4 +-
>  android/handsfree-client.c |   2 +-
>  android/tester-main.c      |   2 +-
>  btio/btio.c                |  62 +++---
>  btio/btio.h                |   2 +-
>  client/main.c              |   6 +-
>  doc/mesh-api.txt           |   2 +-
>  doc/mgmt-api.txt           |   6 +-
>  doc/settings-storage.txt   |   4 +-
>  emulator/btdev.c           | 198 +++++++++---------
>  emulator/hciemu.c          |  21 +-
>  emulator/hciemu.h          |  12 +-
>  emulator/le.c              | 116 +++++------
>  emulator/serial.c          |   6 +-
>  emulator/smp.c             |   8 +-
>  lib/hci.c                  |  52 ++---
>  lib/hci.h                  |  44 ++--
>  lib/hci_lib.h              |   8 +-
>  lib/l2cap.h                |   2 +-
>  lib/mgmt.h                 |   2 +-
>  lib/rfcomm.h               |   2 +-
>  mesh/net-keys.c            |  38 ++--
>  mesh/net-keys.h            |   8 +-
>  mesh/net.h                 |   4 +-
>  monitor/broadcom.c         |   8 +-
>  monitor/bt.h               | 150 +++++++-------
>  monitor/control.c          |  14 +-
>  monitor/l2cap.c            |  10 +-
>  monitor/ll.c               |  60 +++---
>  monitor/lmp.c              |   2 +-
>  monitor/packet.c           | 411 +++++++++++++++++++------------------
>  plugins/sixaxis.c          |  44 ++--
>  profiles/audio/a2dp.c      |   2 +-
>  profiles/audio/avctp.c     |  10 +-
>  profiles/audio/avctp.h     |   2 +-
>  profiles/health/mcap.c     |  22 +-
>  profiles/health/mcap.h     |   2 +-
>  profiles/sap/server.c      |   2 +-
>  src/adapter.c              | 117 ++++++-----
>  src/adapter.h              |   4 +-
>  src/device.c               |   6 +-
>  src/sdpd-server.c          |  10 +-
>  src/sdpd.h                 |   2 +-
>  src/shared/ad.c            |   8 +-
>  src/shared/ad.h            |   2 +-
>  src/shared/hfp.c           |   4 +-
>  src/shared/hfp.h           |   2 +-
>  tools/3dsp.c               |  62 +++---
>  tools/bdaddr.rst           |   2 +-
>  tools/btiotest.c           |  22 +-
>  tools/btpclientctl.c       |   2 +-
>  tools/hci-tester.c         |  16 +-
>  tools/hciconfig.c          |  26 +--
>  tools/hciconfig.rst        |  24 +--
>  tools/hcitool.c            | 110 +++++-----
>  tools/hcitool.rst          |  30 +--
>  tools/l2cap-tester.c       |  36 ++--
>  tools/l2test.c             |  22 +-
>  tools/mesh-cfgclient.c     |   4 +-
>  tools/mesh-gatt/mesh-net.h |   4 +-
>  tools/mesh-gatt/net.c      |  60 +++---
>  tools/mesh/mesh-db.c       |  28 ++-
>  tools/mesh/mesh-db.h       |   4 +-
>  tools/mesh/remote.c        |  53 +++--
>  tools/mesh/remote.h        |   5 +-
>  tools/meshctl.c            |   6 +-
>  tools/mgmt-tester.c        | 138 +++++++------
>  tools/oobtest.c            |  12 +-
>  tools/parser/avdtp.c       |   4 +-
>  tools/parser/csr.c         |  17 +-
>  tools/parser/ericsson.c    |   2 +-
>  tools/parser/hci.c         |  49 ++---
>  tools/parser/lmp.c         | 112 +++++-----
>  tools/parser/parser.h      |   2 +-
>  tools/parser/smp.c         |  12 +-
>  tools/rctest.c             |  22 +-
>  tools/rctest.rst           |   4 +-
>  tools/rfcomm-tester.c      |  14 +-
>  tools/rfcomm.c             |  16 +-
>  tools/rfcomm.rst           |   2 +-
>  tools/sco-tester.c         |  10 +-
>  tools/smp-tester.c         |  16 +-
>  unit/test-mesh-crypto.c    |   4 +-
>  84 files changed, 1237 insertions(+), 1222 deletions(-)
>
> --
> 2.33.0.259.gc128427fd7-goog
>