ucm: rename sysset to sysw

Fixes: 1c6fb202 ("ucm: implement sysset sequence command")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

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

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index a20e173d08a1c1e9fd22e6d3dbb7e8f456fb353b..0f79a92746ee60afe99804827dc67891b5fe140a 100644 (file)
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -772,11 +772,11 @@ static int parse_sequence(snd_use_case_mgr_t *uc_mgr,
                        continue;
                }
 
-               if (strcmp(cmd, "sysset") == 0) {
+               if (strcmp(cmd, "sysw") == 0) {
                        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) {
-                               uc_error("error: sysset requires a string!");
+                               uc_error("error: sysw requires a string!");
                                return err;
                        }
                        continue;

diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h
index 94749502184d6a1023fe5c12a6ebd2563727bfc9..9180a2422298166992f8a39a91b6a3cfa66b6ccf 100644 (file)
--- a/src/ucm/ucm_local.h
+++ b/src/ucm/ucm_local.h
@@ -74,7 +74,7 @@ struct sequence_element {
                char *cdev;
                char *cset;
                char *exec;
-               char *sysset;
+               char *sysw;
                struct component_sequence cmpt_seq; /* component sequence */
        } data;
 };

diff --git a/src/ucm/utils.c b/src/ucm/utils.c
index e5fbb428ebde02b1c50c78bf8de75156edda7cf2..20a870d593614d124f8979a64955888a6e483c68 100644 (file)
--- a/src/ucm/utils.c
+++ b/src/ucm/utils.c
@@ -490,7 +490,7 @@ void uc_mgr_free_sequence_element(struct sequence_element *seq)
                free(seq->data.cset);
                break;
        case SEQUENCE_ELEMENT_TYPE_SYSSET:
-               free(seq->data.sysset);
+               free(seq->data.sysw);
                break;
        case SEQUENCE_ELEMENT_TYPE_EXEC:
                free(seq->data.exec);