mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-15 08:56:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: bluez: backend-native: use strsep() instead of strtok()

Browse source 
`strsep()` is simpler to use than `strtok()` or `strtok_r()`
while being thread-safe and reentrant.

Although it is an extension, it is available in both glibc and musl.
This commit is contained in:
Barnabás Pőcze 2022-09-24 01:42:53 +02:00
parent c1920163d5
commit 8881030904
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
spa/plugins/bluez5/backend-native.c
View file

@ -747,14 +747,11 @@ static bool rfcomm_hfp_ag(struct rfcomm *rfcomm, char* buf)
/* retrieve supported codecs */ /* retrieve supported codecs */
/* response has the form AT+BAC=<codecID1>,<codecID2>,<codecIDx> /* response has the form AT+BAC=<codecID1>,<codecID2>,<codecIDx>
strategy: split the string into tokens */ strategy: split the string into tokens */
static const char separators[] = "=,";
char* token; char* token;
int cntr = 0; int cntr = 0;
token = strtok (buf, separators); while ((token = strsep(&buf, "=,"))) {
while (token != NULL)
{
/* skip token 0 i.e. the "AT+BAC=" part */ /* skip token 0 i.e. the "AT+BAC=" part */
if (cntr > 0) { if (cntr > 0) {
int codec_id; int codec_id;
@ -765,8 +762,6 @@ static bool rfcomm_hfp_ag(struct rfcomm *rfcomm, char* buf)
spa_log_debug(backend->log, "RFCOMM headset supports mSBC codec"); spa_log_debug(backend->log, "RFCOMM headset supports mSBC codec");
} }
} }
/* get next token */
token = strtok (NULL, separators);
cntr++; cntr++;
} }
@ -926,19 +921,17 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* buf)
unsigned int selected_codec; unsigned int selected_codec;
char* token; char* token;
token = strtok(buf, separators); while ((token = strsep(&buf, separators))) {
while (token != NULL)
{
if (spa_strstartswith(token, "+BRSF")) { if (spa_strstartswith(token, "+BRSF")) {
/* get next token */ /* get next token */
token = strtok(NULL, separators); token = strsep(&buf, separators);
features = atoi(token); features = atoi(token);
if (((features & (SPA_BT_HFP_AG_FEATURE_CODEC_NEGOTIATION)) != 0) && if (((features & (SPA_BT_HFP_AG_FEATURE_CODEC_NEGOTIATION)) != 0) &&
rfcomm->msbc_supported_by_hfp) rfcomm->msbc_supported_by_hfp)
rfcomm->codec_negotiation_supported = true; rfcomm->codec_negotiation_supported = true;
} else if (spa_strstartswith(token, "+BCS") && rfcomm->codec_negotiation_supported) { } else if (spa_strstartswith(token, "+BCS") && rfcomm->codec_negotiation_supported) {
/* get next token */ /* get next token */
token = strtok(NULL, separators); token = strsep(&buf, separators);
selected_codec = atoi(token); selected_codec = atoi(token);
if (selected_codec != HFP_AUDIO_CODEC_CVSD && selected_codec != HFP_AUDIO_CODEC_MSBC) { if (selected_codec != HFP_AUDIO_CODEC_CVSD && selected_codec != HFP_AUDIO_CODEC_MSBC) {
@ -967,10 +960,10 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* buf)
} }
} else if (spa_strstartswith(token, "+CIND")) { } else if (spa_strstartswith(token, "+CIND")) {
/* get next token and discard it */ /* get next token and discard it */
token = strtok(NULL, separators); token = strsep(&buf, separators);
} else if (spa_strstartswith(token, "+VGM")) { } else if (spa_strstartswith(token, "+VGM")) {
/* get next token */ /* get next token */
token = strtok(NULL, separators); token = strsep(&buf, separators);
gain = atoi(token); gain = atoi(token);
if (gain <= SPA_BT_VOLUME_HS_MAX) { if (gain <= SPA_BT_VOLUME_HS_MAX) {
@ -980,7 +973,7 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* buf)
} }
} else if (spa_strstartswith(token, "+VGS")) { } else if (spa_strstartswith(token, "+VGS")) {
/* get next token */ /* get next token */
token = strtok(NULL, separators); token = strsep(&buf, separators);
gain = atoi(token); gain = atoi(token);
if (gain <= SPA_BT_VOLUME_HS_MAX) { if (gain <= SPA_BT_VOLUME_HS_MAX) {
@ -1041,8 +1034,6 @@ static bool rfcomm_hfp_hf(struct rfcomm *rfcomm, char* buf)
break; break;
} }
} }
/* get next token */
token = strtok(NULL, separators);
} }
return true; return true;