From 8ef4927973425455b5c6b05ce2f01bf68548ab4f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 4 Jun 2023 16:41:47 +0200 Subject: [PATCH] terminfo, termcap: Fix "discards 'const' qualifier" warnings. * lib/tparm.c (tparm): Change type of 'fmt'. New local variable 'fmtp'. --- ChangeLog | 5 +++++ lib/tparm.c | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8376342668..af117a905a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2023-06-04 Bruno Haible + + terminfo, termcap: Fix "discards 'const' qualifier" warnings. + * lib/tparm.c (tparm): Change type of 'fmt'. New local variable 'fmtp'. + 2023-06-04 Bruno Haible uniname/uniname: Add comments. diff --git a/lib/tparm.c b/lib/tparm.c index e9214e292c..1bc7c74845 100644 --- a/lib/tparm.c +++ b/lib/tparm.c @@ -260,7 +260,7 @@ tparm (const char *str, ...) static char buf[MAX_LINE]; const char *sp; char *dp; - char *fmt; + const char *fmt; char scan_for; int scan_depth; int if_depth; @@ -473,21 +473,22 @@ tparm (const char *str, ...) case '6': case '7': case '8': case '9': if (fmt == NULL) { + char *fmtp; if (termcap) return OOPS; if (*sp == ':') sp++; - fmt = fmt_buf; - *fmt++ = '%'; + fmtp = fmt_buf; + *fmtp++ = '%'; while (*sp != 's' && *sp != 'x' && *sp != 'X' && *sp != 'd' && *sp != 'o' && *sp != 'c' && *sp != 'u') { if (*sp == '\0') return OOPS; - *fmt++ = *sp++; + *fmtp++ = *sp++; } - *fmt++ = *sp; - *fmt = '\0'; + *fmtp++ = *sp; + *fmtp = '\0'; fmt = fmt_buf; } { -- 2.39.5