From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 22389382798C; Thu, 28 Sep 2023 17:50:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 22389382798C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695923442; bh=LaWVnpOLrKXSGWWBzyC/RBVhYfbGS4ac77MeolmaR6I=; h=From:To:Subject:Date:From; b=s2X9Gf3igCbBIQY8ogPPIQwFYX85MsirF+nXLOFXjh3B/i3epEtcc1HTeaIhJgRq6 X0ynG2MLfKpHfF78L3Nlk5toTfcfxXx80DXkf3KCgttR88dd5ePZCbXmF8iToRMvXw 2kvDruBuW4jf/LNzP8Me+MoGRH58JcdTHGEZU/ZM= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] iconvdata: Suppress clang warning on locale definitions X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 9db1a9e5f0ed66fe8cc63807f51a966915460da2 X-Git-Newrev: 575226c3b7e5ca26792e17bcead912ba181bc65c Message-Id: <20230928175042.22389382798C@sourceware.org> Date: Thu, 28 Sep 2023 17:50:42 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=575226c3b7e5ca26792e17bcead912ba181bc65c commit 575226c3b7e5ca26792e17bcead912ba181bc65c Author: Adhemerval Zanella Date: Thu Mar 10 10:01:09 2022 -0300 iconvdata: Suppress clang warning on locale definitions clang issues an warning adding '{unsigned} int' to a string does not append to the string, however it is exactly what code means here. Diff: --- iconvdata/gbk.c | 5 +++++ iconvdata/iso-2022-cn-ext.c | 5 +++++ iconvdata/iso-2022-cn.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c index 6a0ba3388a..40d582f5fb 100644 --- a/iconvdata/gbk.c +++ b/iconvdata/gbk.c @@ -13212,6 +13212,10 @@ static const char __gbk_from_ucs4_tab12[][2] = } #include +/* 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 +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c index 36727f0865..ef1be0bc28 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 +/* 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 @@ -669,6 +673,7 @@ DIAG_POP_NEEDS_COMMENT; #define LOOP_NEED_FLAGS #include +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include diff --git a/iconvdata/iso-2022-cn.c b/iconvdata/iso-2022-cn.c index 5660ead668..0973fdcc46 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 +/* 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 +DIAG_POP_NEEDS_COMMENT_CLANG; /* Now define the toplevel functions. */ #include