conf, seq, ucm: fix discards const from pointer target

Since glibc-2.43:

For ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr,
strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return pointers
into their input arrays now have definitions as macros that return a
pointer to a const-qualified type when the input argument is a pointer
to a const-qualified type.

https://lists.gnu.org/archive/html/info-gnu/2026-01/msg00005.html

Closes: https://github.com/alsa-project/alsa-lib/pull/496
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/conf.c b/src/conf.c
index fb9f0658a816891f1aa59b1949e3db94e08e26c8..b0dd62988cf18645b6f4ab820d58eb4098dbf077 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -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;

diff --git a/src/seq/seqmid.c b/src/seq/seqmid.c
index 280a27bde028e1d10abbf1853e04d5b8421eb565..2bf6afa075dda74491946438daaf7b6e0c1bf099 100644 (file)
--- a/src/seq/seqmid.c
+++ b/src/seq/seqmid.c
@@ -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;

diff --git a/src/ucm/main.c b/src/ucm/main.c
index 72315d282e4f3d615a1ef9e9be984e04fe42636b..d2b3c2d93b82167edc4937de1be77d6bfbda4196 100644 (file)
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -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);

diff --git a/src/ucm/ucm_subs.c b/src/ucm/ucm_subs.c
index eb46ffcf5b602bf2e3a33eb81182bd0465ba94dd..c8b13648bc93b55d6160f9c696a3aa3fa8767449 100644 (file)
--- a/src/ucm/ucm_subs.c
+++ b/src/ucm/ucm_subs.c
@@ -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);