mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-29 05:40:27 -04:00
treewide: try to use const char * for string literals
This commit is contained in:
parent
fc72208fa0
commit
436787d6ba
9 changed files with 20 additions and 17 deletions
|
|
@ -906,9 +906,9 @@ static void run_async_sink(struct data *data)
|
||||||
printf("got error %d\n", res);
|
printf("got error %d\n", res);
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *getscale(uint32_t scale)
|
static const char *getscale(uint32_t scale)
|
||||||
{
|
{
|
||||||
char *scale_s = NULL;
|
const char *scale_s = NULL;
|
||||||
|
|
||||||
if (scale == SPA_AUDIO_VOLUME_RAMP_LINEAR)
|
if (scale == SPA_AUDIO_VOLUME_RAMP_LINEAR)
|
||||||
scale_s = LINEAR;
|
scale_s = LINEAR;
|
||||||
|
|
|
||||||
|
|
@ -843,7 +843,7 @@ static int parse_device(struct impl *this)
|
||||||
|
|
||||||
nextptr = device + 3;
|
nextptr = device + 3;
|
||||||
for (value_index = 0; ; ++value_index) {
|
for (value_index = 0; ; ++value_index) {
|
||||||
char *value_label;
|
const char *value_label;
|
||||||
|
|
||||||
switch (value_index) {
|
switch (value_index) {
|
||||||
case 0: value_label = "card"; break;
|
case 0: value_label = "card"; break;
|
||||||
|
|
|
||||||
|
|
@ -2399,7 +2399,7 @@ static int register_profile(struct impl *backend, const char *profile, const cha
|
||||||
DBusMessageIter it[4];
|
DBusMessageIter it[4];
|
||||||
dbus_bool_t autoconnect;
|
dbus_bool_t autoconnect;
|
||||||
dbus_uint16_t version, chan, features;
|
dbus_uint16_t version, chan, features;
|
||||||
char *str;
|
const char *str;
|
||||||
|
|
||||||
if (!(backend->enabled_profiles & spa_bt_profile_from_uuid(uuid)))
|
if (!(backend->enabled_profiles & spa_bt_profile_from_uuid(uuid)))
|
||||||
return -ECANCELED;
|
return -ECANCELED;
|
||||||
|
|
|
||||||
|
|
@ -1435,7 +1435,7 @@ static bool device_remove_device_set(struct spa_bt_device *device, const char *p
|
||||||
int spa_bt_format_vendor_product_id(uint16_t source_id, uint16_t vendor_id, uint16_t product_id,
|
int spa_bt_format_vendor_product_id(uint16_t source_id, uint16_t vendor_id, uint16_t product_id,
|
||||||
char *vendor_str, int vendor_str_size, char *product_str, int product_str_size)
|
char *vendor_str, int vendor_str_size, char *product_str, int product_str_size)
|
||||||
{
|
{
|
||||||
char *source_str;
|
const char *source_str;
|
||||||
|
|
||||||
switch (source_id) {
|
switch (source_id) {
|
||||||
case SOURCE_ID_USB:
|
case SOURCE_ID_USB:
|
||||||
|
|
|
||||||
|
|
@ -1335,7 +1335,8 @@ static struct service *make_service(struct impl *impl, const struct service_info
|
||||||
if (spa_streq(service_name, "_pipewire-audio._udp")) {
|
if (spa_streq(service_name, "_pipewire-audio._udp")) {
|
||||||
uint32_t mask = 0;
|
uint32_t mask = 0;
|
||||||
for (l = txt; l && compatible; l = l->next) {
|
for (l = txt; l && compatible; l = l->next) {
|
||||||
char *key, *value, *k = NULL;
|
const char *k = NULL;
|
||||||
|
char *key, *value;
|
||||||
|
|
||||||
if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0)
|
if (avahi_string_list_get_pair(l, &key, &value, NULL) != 0)
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -197,7 +197,9 @@ static char *port_alias(char *buffer, int size, struct object *n, struct object
|
||||||
static void print_port(struct data *data, const char *prefix, struct object *n,
|
static void print_port(struct data *data, const char *prefix, struct object *n,
|
||||||
struct object *p, bool verbose)
|
struct object *p, bool verbose)
|
||||||
{
|
{
|
||||||
char buffer[1024], id[64] = "", *prefix2 = "";
|
char buffer[1024], id[64] = "";
|
||||||
|
const char *prefix2 = "";
|
||||||
|
|
||||||
if (data->opt_id) {
|
if (data->opt_id) {
|
||||||
snprintf(id, sizeof(id), "%4d ", p->id);
|
snprintf(id, sizeof(id), "%4d ", p->id);
|
||||||
prefix2 = " ";
|
prefix2 = " ";
|
||||||
|
|
|
||||||
|
|
@ -1207,7 +1207,7 @@ static char* make_xdg_runtime_dir(void)
|
||||||
time_t t = time(NULL);
|
time_t t = time(NULL);
|
||||||
struct tm *tm = localtime(&t);
|
struct tm *tm = localtime(&t);
|
||||||
char *dir;
|
char *dir;
|
||||||
char *tmpdir = getenv("TMPDIR");
|
const char *tmpdir = getenv("TMPDIR");
|
||||||
char path[PATH_MAX];
|
char path[PATH_MAX];
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -232,7 +232,7 @@ PWTEST(logger_debug_env_alpha)
|
||||||
enum spa_log_level level = pwtest_get_iteration(current_test);
|
enum spa_log_level level = pwtest_get_iteration(current_test);
|
||||||
enum spa_log_level default_level = pw_log_level;
|
enum spa_log_level default_level = pw_log_level;
|
||||||
struct spa_log *default_logger = pw_log_get();
|
struct spa_log *default_logger = pw_log_get();
|
||||||
char *lvl = NULL;
|
const char *lvl = NULL;
|
||||||
char *oldenv = getenv("PIPEWIRE_DEBUG");
|
char *oldenv = getenv("PIPEWIRE_DEBUG");
|
||||||
|
|
||||||
if (oldenv)
|
if (oldenv)
|
||||||
|
|
@ -276,7 +276,7 @@ PWTEST(logger_debug_env_topic_all)
|
||||||
struct spa_log *default_logger = pw_log_get();
|
struct spa_log *default_logger = pw_log_get();
|
||||||
char *oldenv = getenv("PIPEWIRE_DEBUG");
|
char *oldenv = getenv("PIPEWIRE_DEBUG");
|
||||||
char lvlstr[32];
|
char lvlstr[32];
|
||||||
char *lvl = "X";
|
const char *lvl = "X";
|
||||||
|
|
||||||
if (oldenv)
|
if (oldenv)
|
||||||
oldenv = strdup(oldenv);
|
oldenv = strdup(oldenv);
|
||||||
|
|
|
||||||
|
|
@ -166,7 +166,7 @@ PWTEST(json_encode)
|
||||||
return PWTEST_PASS;
|
return PWTEST_PASS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_array(char *str, char **vals)
|
static void test_array(const char *str, const char * const vals[])
|
||||||
{
|
{
|
||||||
struct spa_json it[2];
|
struct spa_json it[2];
|
||||||
char val[256];
|
char val[256];
|
||||||
|
|
@ -183,12 +183,12 @@ static void test_array(char *str, char **vals)
|
||||||
|
|
||||||
PWTEST(json_array)
|
PWTEST(json_array)
|
||||||
{
|
{
|
||||||
test_array("FL,FR", (char *[]){ "FL", "FR", NULL });
|
test_array("FL,FR", (const char *[]){ "FL", "FR", NULL });
|
||||||
test_array(" FL , FR ", (char *[]){ "FL", "FR", NULL });
|
test_array(" FL , FR ", (const char *[]){ "FL", "FR", NULL });
|
||||||
test_array("[ FL , FR ]", (char *[]){ "FL", "FR", NULL });
|
test_array("[ FL , FR ]", (const char *[]){ "FL", "FR", NULL });
|
||||||
test_array("[FL FR]", (char *[]){ "FL", "FR", NULL });
|
test_array("[FL FR]", (const char *[]){ "FL", "FR", NULL });
|
||||||
test_array("FL FR", (char *[]){ "FL", "FR", NULL });
|
test_array("FL FR", (const char *[]){ "FL", "FR", NULL });
|
||||||
test_array("[ FL FR ]", (char *[]){ "FL", "FR", NULL });
|
test_array("[ FL FR ]", (const char *[]){ "FL", "FR", NULL });
|
||||||
|
|
||||||
return PWTEST_PASS;
|
return PWTEST_PASS;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue