From 0afa61e8f089fb585fa41675f3ae209ec5969871 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 23 Mar 2021 11:40:30 +0100
Subject: [PATCH] ucm: rename sysset to sysw

Fixes: 1c6fb202 ("ucm: implement sysset sequence command")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 src/ucm/main.c      | 12 ++++++------
 src/ucm/parser.c    |  6 +++---
 src/ucm/ucm_local.h |  2 +-
 src/ucm/utils.c     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ucm/main.c b/src/ucm/main.c
index e2a268d3..a2547cb7 100644
--- 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 a20e173d..0f79a927 100644
--- 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 94749502..9180a242 100644
--- 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 e5fbb428..20a870d5 100644
--- 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);
-- 
2.47.1