public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] iconvdata: Suppress clang warning on locale definitions Date: Fri, 28 Oct 2022 17:40:29 +0000 (GMT) [thread overview] Message-ID: <20221028174029.2A4FB388A416@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1c992e8a735be0dae87ad70b95e068fe7ade3084 commit 1c992e8a735be0dae87ad70b95e068fe7ade3084 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Thu Mar 10 10:01:09 2022 -0300 iconvdata: Suppress clang warning on locale definitions Diff: --- iconvdata/gbk.c | 5 +++++ iconvdata/iso-2022-cn-ext.c | 16 +++++----------- iconvdata/iso-2022-cn.c | 5 +++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c index 53e865e74a..7b294756e5 100644 --- a/iconvdata/gbk.c +++ b/iconvdata/gbk.c @@ -13212,6 +13212,10 @@ static const char __gbk_from_ucs4_tab12[][2] = } #include <iconv/loop.c> +/* clang issues an warning adding 'unsigned int' to a string does not append + to the string, however it is exactly what code means here. */ +DIAG_PUSH_NEEDS_COMMENT_CLANG; +DIAG_IGNORE_NEEDS_COMMENT_CLANG (13, "-Wstring-plus-int"); /* Next, define the other direction. */ #define MIN_NEEDED_INPUT MIN_NEEDED_TO @@ -13493,6 +13497,7 @@ static const char __gbk_from_ucs4_tab12[][2] = #define LOOP_NEED_FLAGS #include <iconv/loop.c> +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include <iconv/skeleton.c> diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c index e09f358cad..7d84560b42 100644 --- a/iconvdata/iso-2022-cn-ext.c +++ b/iconvdata/iso-2022-cn-ext.c @@ -387,6 +387,10 @@ enum #define LOOP_NEED_FLAGS #include <iconv/loop.c> +/* clang issues an warning adding 'int' to a string does not append + to the string, however it is exactly what code means here. */ +DIAG_PUSH_NEEDS_COMMENT_CLANG; +DIAG_IGNORE_NEEDS_COMMENT_CLANG (13, "-Wstring-plus-int"); /* Next, define the other direction. */ #define MIN_NEEDED_INPUT TO_LOOP_MIN_NEEDED_FROM @@ -394,16 +398,6 @@ enum #define MIN_NEEDED_OUTPUT TO_LOOP_MIN_NEEDED_TO #define MAX_NEEDED_OUTPUT TO_LOOP_MAX_NEEDED_TO #define LOOPFCT TO_LOOP -/* With GCC 5.3 when compiling with -Os the compiler emits a warning - that buf[0] and buf[1] may be used uninitialized. This can only - happen in the case where tmpbuf[3] is used, and in that case the - write to the tmpbuf[1] and tmpbuf[2] was assured because - ucs4_to_cns11643 would have filled in those entries. The difficulty - is in getting the compiler to see this logic because tmpbuf[0] is - involved in determining the code page and is the indicator that - tmpbuf[2] is initialized. */ -DIAG_PUSH_NEEDS_COMMENT; -DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); #define BODY \ { \ uint32_t ch; \ @@ -655,7 +649,6 @@ DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); /* Now that we wrote the output increment the input pointer. */ \ inptr += 4; \ } -DIAG_POP_NEEDS_COMMENT; #define EXTRA_LOOP_DECLS , int *setp #define INIT_PARAMS int set = (*setp >> 3) & CURRENT_MASK; \ int ann = (*setp >> 3) & ~CURRENT_MASK @@ -669,6 +662,7 @@ DIAG_POP_NEEDS_COMMENT; #define LOOP_NEED_FLAGS #include <iconv/loop.c> +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include <iconv/skeleton.c> diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c index 9d605fe11c..0de18c5753 100644 --- a/iconvdata/iso-2022-cn.c +++ b/iconvdata/iso-2022-cn.c @@ -227,6 +227,10 @@ enum #define UPDATE_PARAMS *setp = set | ann #include <iconv/loop.c> +/* clang issues an warning adding 'int' to a string does not append + to the string, however it is exactly what code means here. */ +DIAG_PUSH_NEEDS_COMMENT_CLANG; +DIAG_IGNORE_NEEDS_COMMENT_CLANG (13, "-Wstring-plus-int"); /* Next, define the other direction. */ #define MIN_NEEDED_INPUT TO_LOOP_MIN_NEEDED_FROM @@ -401,6 +405,7 @@ enum #define UPDATE_PARAMS *setp = set | ann #include <iconv/loop.c> +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include <iconv/skeleton.c>
next reply other threads:[~2022-10-28 17:40 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-28 17:40 Adhemerval Zanella [this message] -- strict thread matches above, loose matches on Subject: below -- 2024-04-17 20:06 Adhemerval Zanella 2024-04-02 15:52 Adhemerval Zanella 2024-02-09 17:30 Adhemerval Zanella 2024-02-07 14:05 Adhemerval Zanella 2024-01-29 17:55 Adhemerval Zanella 2023-12-21 18:52 Adhemerval Zanella 2023-09-28 17:50 Adhemerval Zanella 2023-08-30 12:35 Adhemerval Zanella 2023-02-09 19:47 Adhemerval Zanella 2022-10-04 12:58 Adhemerval Zanella
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221028174029.2A4FB388A416@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).