mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: rename sysset to sysw

Browse source 
Fixes: 1c6fb202 ("ucm: implement sysset sequence command")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-03-23 11:40:30 +01:00
parent 7bf1dd543b
commit 0afa61e8f0
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ucm/main.c
View file

@ -324,7 +324,7 @@ static int execute_cset(snd_ctl_t *ctl, const char *cset, unsigned int type)
return err; return err;
} }
static int execute_sysset(const char *sysset) static int execute_sysw(const char *sysw)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
const char *e; const char *e;
@ -334,15 +334,15 @@ static int execute_sysset(const char *sysset)
int fd, myerrno; int fd, myerrno;
bool ignore_error = false; bool ignore_error = false;
if (sysset == NULL || *sysset == '\0') if (sysw == NULL || *sysw == '\0')
return 0; return 0;
ignore_error = sysset[0] == '-'; ignore_error = sysw[0] == '-';
if (sysset[0] == ':') if (sysw[0] == ':')
return -EINVAL; return -EINVAL;
s = strdup(sysset[0] != '/' ? sysset : sysset + 1); s = strdup(sysw[0] != '/' ? sysw : sysw + 1);
if (s == NULL) if (s == NULL)
return -ENOMEM; return -ENOMEM;
@ -488,7 +488,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr,
} }
break; break;
case SEQUENCE_ELEMENT_TYPE_SYSSET: case SEQUENCE_ELEMENT_TYPE_SYSSET:
err = execute_sysset(s->data.sysset); err = execute_sysw(s->data.sysw);
if (err < 0) if (err < 0)
goto __fail; goto __fail;
break; break;

6
src/ucm/parser.c
View file

@ -772,11 +772,11 @@ static int parse_sequence(snd_use_case_mgr_t *uc_mgr,
continue; continue;
} }
if (strcmp(cmd, "sysset") == 0) { if (strcmp(cmd, "sysw") == 0) {
curr->type = SEQUENCE_ELEMENT_TYPE_SYSSET; curr->type = SEQUENCE_ELEMENT_TYPE_SYSSET;
err = parse_string_substitute3(uc_mgr, n, &curr->data.sysset); err = parse_string_substitute3(uc_mgr, n, &curr->data.sysw);
if (err < 0) { if (err < 0) {
uc_error("error: sysset requires a string!"); uc_error("error: sysw requires a string!");
return err; return err;
} }
continue; continue;

2
src/ucm/ucm_local.h
View file

@ -74,7 +74,7 @@ struct sequence_element {
char *cdev; char *cdev;
char *cset; char *cset;
char *exec; char *exec;
char *sysset; char *sysw;
struct component_sequence cmpt_seq; /* component sequence */ struct component_sequence cmpt_seq; /* component sequence */
} data; } data;
}; };

2
src/ucm/utils.c
View file

@ -490,7 +490,7 @@ void uc_mgr_free_sequence_element(struct sequence_element *seq)
free(seq->data.cset); free(seq->data.cset);
break; break;
case SEQUENCE_ELEMENT_TYPE_SYSSET: case SEQUENCE_ELEMENT_TYPE_SYSSET:
free(seq->data.sysset); free(seq->data.sysw);
break; break;
case SEQUENCE_ELEMENT_TYPE_EXEC: case SEQUENCE_ELEMENT_TYPE_EXEC:
free(seq->data.exec); free(seq->data.exec);