mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: replace !strcmp() with spa_streq()

Browse source 
This change is only done in source files for now, header files will be done
separately.
This commit is contained in:
Peter Hutterer 2021-05-18 11:40:50 +10:00
parent 7697ed0757
commit 95a84e797a
28 changed files with 239 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/tools/pw-cat.c
View file

@ -167,17 +167,17 @@ sf_str_to_fmt(const char *str)
if (!str)
return -1;
if (!strcmp(str, "s8"))
if (spa_streq(str, "s8"))
return SF_FORMAT_PCM_S8;
if (!strcmp(str, "s16"))
if (spa_streq(str, "s16"))
return SF_FORMAT_PCM_16;
if (!strcmp(str, "s24"))
if (spa_streq(str, "s24"))
return SF_FORMAT_PCM_24;
if (!strcmp(str, "s32"))
if (spa_streq(str, "s32"))
return SF_FORMAT_PCM_32;
if (!strcmp(str, "f32"))
if (spa_streq(str, "f32"))
return SF_FORMAT_FLOAT;
if (!strcmp(str, "f64"))
if (spa_streq(str, "f64"))
return SF_FORMAT_DOUBLE;
return -1;
@ -742,9 +742,9 @@ static void registry_event_global(void *userdata, uint32_t id,
/* get allowed mode from the media class */
/* TODO extend to something else besides Audio/Source|Sink */
if (!strcmp(media_class, "Audio/Source"))
if (spa_streq(media_class, "Audio/Source"))
mode = mode_record;
else if (!strcmp(media_class, "Audio/Sink"))
else if (spa_streq(media_class, "Audio/Sink"))
mode = mode_playback;
/* modes must match */
@ -1029,7 +1029,7 @@ static void show_usage(const char *name, bool is_error)
DEFAULT_VOLUME,
DEFAULT_QUALITY);
if (!strcmp(name, "pw-cat")) {
if (spa_streq(name, "pw-cat")) {
fputs(
_(" -p, --playback Playback mode\n"
" -r, --record Recording mode\n"
@ -1292,15 +1292,15 @@ static int setup_sndfile(struct data *data)
s++;
if (!*s)
data->latency_unit = unit_samples;
else if (!strcmp(s, "none"))
else if (spa_streq(s, "none"))
data->latency_unit = unit_none;
else if (!strcmp(s, "s") || !strcmp(s, "sec") || !strcmp(s, "secs"))
else if (spa_streq(s, "s") || spa_streq(s, "sec") || spa_streq(s, "secs"))
data->latency_unit = unit_sec;
else if (!strcmp(s, "ms") || !strcmp(s, "msec") || !strcmp(s, "msecs"))
else if (spa_streq(s, "ms") || spa_streq(s, "msec") || spa_streq(s, "msecs"))
data->latency_unit = unit_msec;
else if (!strcmp(s, "us") || !strcmp(s, "usec") || !strcmp(s, "usecs"))
else if (spa_streq(s, "us") || spa_streq(s, "usec") || spa_streq(s, "usecs"))
data->latency_unit = unit_usec;
else if (!strcmp(s, "ns") || !strcmp(s, "nsec") || !strcmp(s, "nsecs"))
else if (spa_streq(s, "ns") || spa_streq(s, "nsec") || spa_streq(s, "nsecs"))
data->latency_unit = unit_nsec;
else {
fprintf(stderr, "error: bad latency value %s (bad unit)\n", data->latency);
@ -1370,14 +1370,14 @@ int main(int argc, char *argv[])
prog = argv[0];
/* prime the mode from the program name */
if (!strcmp(prog, "pw-play"))
if (spa_streq(prog, "pw-play"))
data.mode = mode_playback;
else if (!strcmp(prog, "pw-record"))
else if (spa_streq(prog, "pw-record"))
data.mode = mode_record;
else if (!strcmp(prog, "pw-midiplay")) {
else if (spa_streq(prog, "pw-midiplay")) {
data.mode = mode_playback;
data.is_midi = true;
} else if (!strcmp(prog, "pw-midirecord")) {
} else if (spa_streq(prog, "pw-midirecord")) {
data.mode = mode_record;
data.is_midi = true;
} else
@ -1445,7 +1445,7 @@ int main(int argc, char *argv[])
case OPT_TARGET:
data.target = optarg;
if (!strcmp(optarg, "auto")) {
if (spa_streq(optarg, "auto")) {
data.target_id = PW_ID_ANY;
break;
}

96
src/tools/pw-cli.c
View file

@ -1835,27 +1835,27 @@ global_props(struct global *global)
if (!pd || !pd->info)
return NULL;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Core))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Core))
return ((struct pw_core_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Module))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Module))
return ((struct pw_module_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Device))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Device))
return ((struct pw_device_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Node))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Node))
return ((struct pw_node_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Port))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Port))
return ((struct pw_port_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Factory))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Factory))
return ((struct pw_factory_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Client))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Client))
return ((struct pw_client_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Link))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Link))
return ((struct pw_link_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Session))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Session))
return ((struct pw_session_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Endpoint))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Endpoint))
return ((struct pw_endpoint_info *)pd->info)->props;
if (!strcmp(global->type, PW_TYPE_INTERFACE_EndpointStream))
if (spa_streq(global->type, PW_TYPE_INTERFACE_EndpointStream))
return ((struct pw_endpoint_stream_info *)pd->info)->props;
return NULL;
@ -1922,20 +1922,20 @@ children_of(struct remote_data *rd, uint32_t parent_id,
return -1;
/* supported combinations */
if (!strcmp(parent_type, PW_TYPE_INTERFACE_Device) &&
!strcmp(child_type, PW_TYPE_INTERFACE_Node)) {
if (spa_streq(parent_type, PW_TYPE_INTERFACE_Device) &&
spa_streq(child_type, PW_TYPE_INTERFACE_Node)) {
parent_key = PW_KEY_OBJECT_ID;
child_key = PW_KEY_DEVICE_ID;
} else if (!strcmp(parent_type, PW_TYPE_INTERFACE_Node) &&
!strcmp(child_type, PW_TYPE_INTERFACE_Port)) {
} else if (spa_streq(parent_type, PW_TYPE_INTERFACE_Node) &&
spa_streq(child_type, PW_TYPE_INTERFACE_Port)) {
parent_key = PW_KEY_OBJECT_ID;
child_key = PW_KEY_NODE_ID;
} else if (!strcmp(parent_type, PW_TYPE_INTERFACE_Module) &&
!strcmp(child_type, PW_TYPE_INTERFACE_Factory)) {
} else if (spa_streq(parent_type, PW_TYPE_INTERFACE_Module) &&
spa_streq(child_type, PW_TYPE_INTERFACE_Factory)) {
parent_key = PW_KEY_OBJECT_ID;
child_key = PW_KEY_MODULE_ID;
} else if (!strcmp(parent_type, PW_TYPE_INTERFACE_Factory) &&
!strcmp(child_type, PW_TYPE_INTERFACE_Device)) {
} else if (spa_streq(parent_type, PW_TYPE_INTERFACE_Factory) &&
spa_streq(child_type, PW_TYPE_INTERFACE_Device)) {
parent_key = PW_KEY_OBJECT_ID;
child_key = PW_KEY_FACTORY_ID;
} else
@ -2029,7 +2029,7 @@ int dump_type_index(const char *type)
return -1;
for (i = 0; i < SPA_N_ELEMENTS(dump_types); i++) {
if (!strcmp(dump_types[i], type))
if (spa_streq(dump_types[i], type))
return (int)i;
}
@ -2094,19 +2094,19 @@ dump_properties(struct data *data, struct global *global,
extra = NULL;
id = -1;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Port) && !strcmp(item->key, PW_KEY_NODE_ID)) {
if (spa_streq(global->type, PW_TYPE_INTERFACE_Port) && spa_streq(item->key, PW_KEY_NODE_ID)) {
id = atoi(item->value);
if (id >= 0)
extra = obj_lookup(rd, id, PW_KEY_NODE_NAME);
} else if (!strcmp(global->type, PW_TYPE_INTERFACE_Factory) && !strcmp(item->key, PW_KEY_MODULE_ID)) {
} else if (spa_streq(global->type, PW_TYPE_INTERFACE_Factory) && spa_streq(item->key, PW_KEY_MODULE_ID)) {
id = atoi(item->value);
if (id >= 0)
extra = obj_lookup(rd, id, PW_KEY_MODULE_NAME);
} else if (!strcmp(global->type, PW_TYPE_INTERFACE_Device) && !strcmp(item->key, PW_KEY_FACTORY_ID)) {
} else if (spa_streq(global->type, PW_TYPE_INTERFACE_Device) && spa_streq(item->key, PW_KEY_FACTORY_ID)) {
id = atoi(item->value);
if (id >= 0)
extra = obj_lookup(rd, id, PW_KEY_FACTORY_NAME);
} else if (!strcmp(global->type, PW_TYPE_INTERFACE_Device) && !strcmp(item->key, PW_KEY_CLIENT_ID)) {
} else if (spa_streq(global->type, PW_TYPE_INTERFACE_Device) && spa_streq(item->key, PW_KEY_CLIENT_ID)) {
id = atoi(item->value);
if (id >= 0)
extra = obj_lookup(rd, id, PW_KEY_CLIENT_NAME);
@ -2303,8 +2303,8 @@ dump_device(struct data *data, struct global *global,
api ? api : "",
api ? "\"" : "");
if (media_class && !strcmp(media_class, "Audio/Device") &&
api && !strcmp(api, "alsa:pcm")) {
if (media_class && spa_streq(media_class, "Audio/Device") &&
api && spa_streq(api, "alsa:pcm")) {
alsa_path = spa_dict_lookup(info->props, SPA_KEY_API_ALSA_PATH);
alsa_card_id = spa_dict_lookup(info->props, SPA_KEY_API_ALSA_CARD_ID);
@ -2731,37 +2731,37 @@ dump(struct data *data, struct global *global,
if (!global)
return;
if (!strcmp(global->type, PW_TYPE_INTERFACE_Core))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Core))
dump_core(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Module))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Module))
dump_module(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Device))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Device))
dump_device(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Node))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Node))
dump_node(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Port))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Port))
dump_port(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Factory))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Factory))
dump_factory(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Client))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Client))
dump_client(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Link))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Link))
dump_link(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Session))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Session))
dump_session(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_Endpoint))
if (spa_streq(global->type, PW_TYPE_INTERFACE_Endpoint))
dump_endpoint(data, global, flags, level);
if (!strcmp(global->type, PW_TYPE_INTERFACE_EndpointStream))
if (spa_streq(global->type, PW_TYPE_INTERFACE_EndpointStream))
dump_endpoint_stream(data, global, flags, level);
}
@ -2783,17 +2783,17 @@ static bool do_dump(struct data *data, const char *cmd, char *args, char **error
a = aa;
while (n > 0 &&
(!strcmp(a[0], "short") ||
!strcmp(a[0], "deep") ||
!strcmp(a[0], "resolve") ||
!strcmp(a[0], "notype"))) {
if (!strcmp(a[0], "short"))
(spa_streq(a[0], "short") ||
spa_streq(a[0], "deep") ||
spa_streq(a[0], "resolve") ||
spa_streq(a[0], "notype"))) {
if (spa_streq(a[0], "short"))
flags |= is_short;
else if (!strcmp(a[0], "deep"))
else if (spa_streq(a[0], "deep"))
flags |= is_deep;
else if (!strcmp(a[0], "resolve"))
else if (spa_streq(a[0], "resolve"))
flags |= is_resolve;
else if (!strcmp(a[0], "notype"))
else if (spa_streq(a[0], "notype"))
flags |= is_notype;
n--;
a++;
@ -2816,7 +2816,7 @@ static bool do_dump(struct data *data, const char *cmd, char *args, char **error
a++;
}
if (n == 0 || !strcmp(a[0], "all")) {
if (n == 0 || spa_streq(a[0], "all")) {
type_mask = (1U << dump_type_count()) - 1;
flags &= ~is_notype;
} else {
@ -2900,8 +2900,8 @@ static bool parse(struct data *data, char *buf, size_t size, char **error)
args = n > 1 ? a[1] : "";
for (i = 0; i < SPA_N_ELEMENTS(command_list); i++) {
if (!strcmp(command_list[i].name, cmd) ||
!strcmp(command_list[i].alias, cmd)) {
if (spa_streq(command_list[i].name, cmd) ||
spa_streq(command_list[i].alias, cmd)) {
return command_list[i].func(data, cmd, args, error);
}
}