]> git.alsa-project.org Git - alsa-lib.git/commitdiff
ucm: substitution - remove duplicate allow_empty assignment
authorJaroslav Kysela <perex@perex.cz>
Tue, 30 Jun 2020 07:22:12 +0000 (09:22 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 30 Jun 2020 07:22:12 +0000 (09:22 +0200)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/ucm/ucm_subs.c

index a154aa510ee81942a5c3e6c276eb51a71b70fd08..d40e5478b084be90cca8883fbdc412b7caee717d 100644 (file)
@@ -303,7 +303,6 @@ __std:
                } else if (value[1] != '{') {
                        goto __std;
                }
-               allow_empty = false;
                fcn2 = NULL;
                MATCH_VARIABLE(value, "${OpenName}", rval_open_name, false);
                MATCH_VARIABLE(value, "${ConfTopDir}", rval_conf_topdir, false);
@@ -365,7 +364,8 @@ __rval:
                        }
                        strncpy(r, value, idsize);
                        r[idsize] = '\0';
-                       uc_error("variable '%s' is not defined in this context!", r);
+                       uc_error("variable '%s' is %s in this context!", r,
+                                rval ? "empty" : "not defined");
                        err = -EINVAL;
                        goto __error;
                }