mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2026-02-20 01:40:28 -05:00
treewide: fix some -Wdiscarded-qualifiers
Newer glibc versions have made certain `str*()` functions into macros that ensure that the const-ness of the argument is propagated to the return type.
This commit is contained in:
parent
d7c3e8c2bc
commit
e46bfe67b6
3 changed files with 5 additions and 8 deletions
|
|
@ -5318,7 +5318,7 @@ int jack_set_freewheel(jack_client_t* client, int onoff)
|
|||
pw_thread_loop_lock(c->context.loop);
|
||||
str = pw_properties_get(c->props, PW_KEY_NODE_GROUP);
|
||||
if (str != NULL) {
|
||||
char *p = strstr(str, ",pipewire.freewheel");
|
||||
const char *p = strstr(str, ",pipewire.freewheel");
|
||||
if (p == NULL)
|
||||
p = strstr(str, "pipewire.freewheel");
|
||||
if (p == NULL && onoff)
|
||||
|
|
|
|||
|
|
@ -720,14 +720,12 @@ static const char *bap_features_get_uuid(struct bap_features *feat, size_t i)
|
|||
/** Get feature name at \a i, or NULL if uuid doesn't match */
|
||||
static const char *bap_features_get_name(struct bap_features *feat, size_t i, const char *uuid)
|
||||
{
|
||||
char *pos;
|
||||
|
||||
if (i >= feat->dict.n_items)
|
||||
return NULL;
|
||||
if (!spa_streq(feat->dict.items[i].value, uuid))
|
||||
return NULL;
|
||||
|
||||
pos = strchr(feat->dict.items[i].key, ':');
|
||||
const char *pos = strchr(feat->dict.items[i].key, ':');
|
||||
if (!pos)
|
||||
return NULL;
|
||||
return pos + 1;
|
||||
|
|
@ -1336,7 +1334,6 @@ static struct spa_bt_adapter *adapter_find(struct spa_bt_monitor *monitor, const
|
|||
static int parse_modalias(const char *modalias, uint16_t *source, uint16_t *vendor,
|
||||
uint16_t *product, uint16_t *version)
|
||||
{
|
||||
char *pos;
|
||||
unsigned int src, i, j, k;
|
||||
|
||||
if (spa_strstartswith(modalias, "bluetooth:"))
|
||||
|
|
@ -1346,7 +1343,7 @@ static int parse_modalias(const char *modalias, uint16_t *source, uint16_t *vend
|
|||
else
|
||||
return -EINVAL;
|
||||
|
||||
pos = strchr(modalias, ':');
|
||||
const char *pos = strchr(modalias, ':');
|
||||
if (pos == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ impl_log_logtv(void *object,
|
|||
char timestamp[18] = {0};
|
||||
char topicstr[32] = {0};
|
||||
char filename[64] = {0};
|
||||
char location[1000 + RESERVED_LENGTH], *p, *s;
|
||||
char location[1000 + RESERVED_LENGTH], *p;
|
||||
static const char * const levels[] = { "-", "E", "W", "I", "D", "T", "*T*" };
|
||||
const char *prefix = "", *suffix = "";
|
||||
int size, len;
|
||||
|
|
@ -118,7 +118,7 @@ impl_log_logtv(void *object,
|
|||
|
||||
|
||||
if (impl->line && line != 0) {
|
||||
s = strrchr(file, '/');
|
||||
const char *s = strrchr(file, '/');
|
||||
spa_scnprintf(filename, sizeof(filename), "[%16.16s:%5i %s()]",
|
||||
s ? s + 1 : file, line, func);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue