mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2026-03-30 11:10:19 -04:00
Merge 757f3a86c9 into 62c24074ae
This commit is contained in:
commit
804a86f0e3
4 changed files with 10 additions and 7 deletions
|
|
@ -4443,7 +4443,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
|
|||
goto __err;
|
||||
}
|
||||
while (1) {
|
||||
char *s = strchr(driver, '.');
|
||||
const char *s = strchr(driver, '.');
|
||||
if (s == NULL)
|
||||
break;
|
||||
driver = s + 1;
|
||||
|
|
|
|||
|
|
@ -424,8 +424,8 @@ int snd_seq_sync_output_queue(snd_seq_t *seq)
|
|||
*/
|
||||
int snd_seq_parse_address(snd_seq_t *seq, snd_seq_addr_t *addr, const char *arg)
|
||||
{
|
||||
char *p, *buf;
|
||||
const char *s;
|
||||
char *buf;
|
||||
const char *p, *s;
|
||||
char c;
|
||||
long client, port = 0;
|
||||
int len;
|
||||
|
|
|
|||
|
|
@ -2379,7 +2379,8 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr,
|
|||
const char *identifier,
|
||||
const char **list[])
|
||||
{
|
||||
char *str, *str1;
|
||||
char *str;
|
||||
const char *str1;
|
||||
int err, i;
|
||||
|
||||
if (uc_mgr == NULL || identifier == NULL) {
|
||||
|
|
@ -2712,7 +2713,8 @@ int snd_use_case_geti(snd_use_case_mgr_t *uc_mgr,
|
|||
const char *identifier,
|
||||
long *value)
|
||||
{
|
||||
char *str, *str1;
|
||||
char *str;
|
||||
const char *str1;
|
||||
int err;
|
||||
|
||||
pthread_mutex_lock(&uc_mgr->mutex);
|
||||
|
|
@ -3014,7 +3016,8 @@ int snd_use_case_set(snd_use_case_mgr_t *uc_mgr,
|
|||
const char *identifier,
|
||||
const char *value)
|
||||
{
|
||||
char *str, *str1;
|
||||
char *str;
|
||||
const char *str1;
|
||||
int err = 0;
|
||||
|
||||
snd_trace(UCM, "{API call} set '%s'='%s'", identifier, value);
|
||||
|
|
|
|||
|
|
@ -938,7 +938,7 @@ static int rval_evali(snd_use_case_mgr_t *uc_mgr, snd_config_t *node, const char
|
|||
*/
|
||||
static inline const char *strchr_with_escape(const char *str, char c)
|
||||
{
|
||||
char *s;
|
||||
const char *s;
|
||||
|
||||
while (1) {
|
||||
s = strchr(str, c);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue