https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2f46bc5c6f4e1595eb2cfbb91f8fdb4cf16fa9dc commit 2f46bc5c6f4e1595eb2cfbb91f8fdb4cf16fa9dc 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>
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>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8ca0b2b709e64f1f519fd526c7c95108b8d6873a commit 8ca0b2b709e64f1f519fd526c7c95108b8d6873a 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 6a0ba3388a..40d582f5fb 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 d0c3ca4f03..10fcecebba 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 73eb5e77c6..828d4dbab5 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>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=59b54e8647f2bf9477fab0c4fcc39902c3957af2 commit 59b54e8647f2bf9477fab0c4fcc39902c3957af2 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 6a0ba3388a..40d582f5fb 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 36727f0865..ebca74039a 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 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 <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>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=575226c3b7e5ca26792e17bcead912ba181bc65c commit 575226c3b7e5ca26792e17bcead912ba181bc65c Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 <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 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 <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 @@ -669,6 +673,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 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 <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>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ef27e1a78d5cb87a273689e08f8ad0a1a73c0a09 commit ef27e1a78d5cb87a273689e08f8ad0a1a73c0a09 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 <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 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 <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 @@ -669,6 +673,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 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 <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>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=31f2d4381fbc1c09668a1b24c6ef502370dc41a1 commit 31f2d4381fbc1c09668a1b24c6ef502370dc41a1 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 d1365ca188..59bfda1b24 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 b34c8a36f4..dce7359537 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 @@ -669,6 +673,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 0990595e96..2f0fb5987d 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>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9bef3891b6e24968e7e557b5ea60dcc00661a010 commit 9bef3891b6e24968e7e557b5ea60dcc00661a010 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 d1365ca188..59bfda1b24 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 0be9278740..942a5e0542 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 @@ -669,6 +673,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 0990595e96..2f0fb5987d 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>
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dd61a944f0c147296956918fd687c02cd294475d commit dd61a944f0c147296956918fd687c02cd294475d Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 d1365ca188..59bfda1b24 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 0be9278740..942a5e0542 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 @@ -669,6 +673,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 0990595e96..2f0fb5987d 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>