| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 16 Feb 2024 14:55:52 +0100
From: Helge Deller <deller@....de>
To: Arnd Bergmann <arnd@...nel.org>,
"James E.J. Bottomley" <James.Bottomley@...senPartnership.com>
Cc: Arnd Bergmann <arnd@...db.de>, linux-parisc@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] parisc: avoid c23 'nullptr' idenitifier
On 2/12/24 12:20, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@...db.de>
>
> Starting in c23, this is a reserved keyword, so in the future, using it
> will start causing build failures:
>
> arch/parisc/math-emu/frnd.c:36:23: error: expected ';', ',' or ')' before 'nullptr'
>
> Since I can't think of a good replacement name, add a leading underscore
> to the function argument to avoid this namespace conflict. Apparently
> all of these arguments are unused.
>
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> ---
> Feel free to come up with a better name here and apply a different
> patch, treating this as a bug report.
Thanks for the patch!
I actually don't have a better idea for the name either, so I applied
the patch as-is to the parisc tree :-)
Thanks!
Helge
> ---
> arch/parisc/math-emu/dfsqrt.c | 4 ++--
> arch/parisc/math-emu/fcnvff.c | 8 ++++----
> arch/parisc/math-emu/fcnvfu.c | 16 ++++++++--------
> arch/parisc/math-emu/fcnvfut.c | 16 ++++++++--------
> arch/parisc/math-emu/fcnvfx.c | 16 ++++++++--------
> arch/parisc/math-emu/fcnvfxt.c | 16 ++++++++--------
> arch/parisc/math-emu/fcnvuf.c | 16 ++++++++--------
> arch/parisc/math-emu/fcnvxf.c | 16 ++++++++--------
> arch/parisc/math-emu/frnd.c | 8 ++++----
> arch/parisc/math-emu/sfsqrt.c | 4 ++--
> 10 files changed, 60 insertions(+), 60 deletions(-)
>
> diff --git a/arch/parisc/math-emu/dfsqrt.c b/arch/parisc/math-emu/dfsqrtc
> index 63d339c81c14..e3a3a19b966b 100644
> --- a/arch/parisc/math-emu/dfsqrt.c
> +++ b/arch/parisc/math-emu/dfsqrt.c
> @@ -15,7 +15,7 @@
> * Double Floating-point Square Root
> *
> * External Interfaces:
> - * dbl_fsqrt(srcptr,nullptr,dstptr,status)
> + * dbl_fsqrt(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -37,7 +37,7 @@
> unsigned int
> dbl_fsqrt(
> dbl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_floating_point *dstptr,
> unsigned int *status)
> {
> diff --git a/arch/parisc/math-emu/fcnvff.c b/arch/parisc/math-emu/fcnvffc
> index 0530e6127797..61e489704c86 100644
> --- a/arch/parisc/math-emu/fcnvff.c
> +++ b/arch/parisc/math-emu/fcnvff.c
> @@ -16,8 +16,8 @@
> * Double Floating-point to Single Floating-point
> *
> * External Interfaces:
> - * dbl_to_sgl_fcnvff(srcptr,nullptr,dstptr,status)
> - * sgl_to_dbl_fcnvff(srcptr,nullptr,dstptr,status)
> + * dbl_to_sgl_fcnvff(srcptr,_nullptr,dstptr,status)
> + * sgl_to_dbl_fcnvff(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -40,7 +40,7 @@
> int
> sgl_to_dbl_fcnvff(
> sgl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_floating_point *dstptr,
> unsigned int *status)
> {
> @@ -127,7 +127,7 @@ sgl_to_dbl_fcnvff(
> int
> dbl_to_sgl_fcnvff(
> dbl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> sgl_floating_point *dstptr,
> unsigned int *status)
> {
> diff --git a/arch/parisc/math-emu/fcnvfu.c b/arch/parisc/math-emu/fcnvfuc
> index c971618a6f3c..c31790ceecca 100644
> --- a/arch/parisc/math-emu/fcnvfu.c
> +++ b/arch/parisc/math-emu/fcnvfu.c
> @@ -15,10 +15,10 @@
> * Floating-point to Unsigned Fixed-point Converts
> *
> * External Interfaces:
> - * dbl_to_dbl_fcnvfu(srcptr,nullptr,dstptr,status)
> - * dbl_to_sgl_fcnvfu(srcptr,nullptr,dstptr,status)
> - * sgl_to_dbl_fcnvfu(srcptr,nullptr,dstptr,status)
> - * sgl_to_sgl_fcnvfu(srcptr,nullptr,dstptr,status)
> + * dbl_to_dbl_fcnvfu(srcptr,_nullptr,dstptr,status)
> + * dbl_to_sgl_fcnvfu(srcptr,_nullptr,dstptr,status)
> + * sgl_to_dbl_fcnvfu(srcptr,_nullptr,dstptr,status)
> + * sgl_to_sgl_fcnvfu(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -45,7 +45,7 @@
> int
> sgl_to_sgl_fcnvfu(
> sgl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> unsigned int *dstptr,
> unsigned int *status)
> {
> @@ -166,7 +166,7 @@ sgl_to_sgl_fcnvfu(
> int
> sgl_to_dbl_fcnvfu(
> sgl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_unsigned *dstptr,
> unsigned int *status)
> {
> @@ -285,7 +285,7 @@ sgl_to_dbl_fcnvfu(
> */
> /*ARGSUSED*/
> int
> -dbl_to_sgl_fcnvfu (dbl_floating_point * srcptr, unsigned int *nullptr,
> +dbl_to_sgl_fcnvfu (dbl_floating_point * srcptr, unsigned int *_nullptr,
> unsigned int *dstptr, unsigned int *status)
> {
> register unsigned int srcp1, srcp2, result;
> @@ -408,7 +408,7 @@ dbl_to_sgl_fcnvfu (dbl_floating_point * srcptr, unsigned int *nullptr,
> */
> /*ARGSUSED*/
> int
> -dbl_to_dbl_fcnvfu (dbl_floating_point * srcptr, unsigned int *nullptr,
> +dbl_to_dbl_fcnvfu (dbl_floating_point * srcptr, unsigned int *_nullptr,
> dbl_unsigned * dstptr, unsigned int *status)
> {
> register int src_exponent;
> diff --git a/arch/parisc/math-emu/fcnvfut.c b/arch/parisc/math-emu/fcnvfut.c
> index 5b657f852578..2cf1daf3b7ad 100644
> --- a/arch/parisc/math-emu/fcnvfut.c
> +++ b/arch/parisc/math-emu/fcnvfut.c
> @@ -15,10 +15,10 @@
> * Floating-point to Unsigned Fixed-point Converts with Truncation
> *
> * External Interfaces:
> - * dbl_to_dbl_fcnvfut(srcptr,nullptr,dstptr,status)
> - * dbl_to_sgl_fcnvfut(srcptr,nullptr,dstptr,status)
> - * sgl_to_dbl_fcnvfut(srcptr,nullptr,dstptr,status)
> - * sgl_to_sgl_fcnvfut(srcptr,nullptr,dstptr,status)
> + * dbl_to_dbl_fcnvfut(srcptr,_nullptr,dstptr,status)
> + * dbl_to_sgl_fcnvfut(srcptr,_nullptr,dstptr,status)
> + * sgl_to_dbl_fcnvfut(srcptr,_nullptr,dstptr,status)
> + * sgl_to_sgl_fcnvfut(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -44,7 +44,7 @@
> */
> /*ARGSUSED*/
> int
> -sgl_to_sgl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr,
> +sgl_to_sgl_fcnvfut (sgl_floating_point * srcptr, unsigned int *_nullptr,
> unsigned int *dstptr, unsigned int *status)
> {
> register unsigned int src, result;
> @@ -113,7 +113,7 @@ sgl_to_sgl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr,
> */
> /*ARGSUSED*/
> int
> -sgl_to_dbl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr,
> +sgl_to_dbl_fcnvfut (sgl_floating_point * srcptr, unsigned int *_nullptr,
> dbl_unsigned * dstptr, unsigned int *status)
> {
> register int src_exponent;
> @@ -183,7 +183,7 @@ sgl_to_dbl_fcnvfut (sgl_floating_point * srcptr, unsigned int *nullptr,
> */
> /*ARGSUSED*/
> int
> -dbl_to_sgl_fcnvfut (dbl_floating_point * srcptr, unsigned int *nullptr,
> +dbl_to_sgl_fcnvfut (dbl_floating_point * srcptr, unsigned int *_nullptr,
> unsigned int *dstptr, unsigned int *status)
> {
> register unsigned int srcp1, srcp2, result;
> @@ -252,7 +252,7 @@ dbl_to_sgl_fcnvfut (dbl_floating_point * srcptr, unsigned int *nullptr,
> */
> /*ARGSUSED*/
> int
> -dbl_to_dbl_fcnvfut (dbl_floating_point * srcptr, unsigned int *nullptr,
> +dbl_to_dbl_fcnvfut (dbl_floating_point * srcptr, unsigned int *_nullptr,
> dbl_unsigned * dstptr, unsigned int *status)
> {
> register int src_exponent;
> diff --git a/arch/parisc/math-emu/fcnvfx.c b/arch/parisc/math-emu/fcnvfxc
> index 5e153078d803..99bd61479452 100644
> --- a/arch/parisc/math-emu/fcnvfx.c
> +++ b/arch/parisc/math-emu/fcnvfx.c
> @@ -18,10 +18,10 @@
> * Double Floating-point to Double Fixed-point
> *
> * External Interfaces:
> - * dbl_to_dbl_fcnvfx(srcptr,nullptr,dstptr,status)
> - * dbl_to_sgl_fcnvfx(srcptr,nullptr,dstptr,status)
> - * sgl_to_dbl_fcnvfx(srcptr,nullptr,dstptr,status)
> - * sgl_to_sgl_fcnvfx(srcptr,nullptr,dstptr,status)
> + * dbl_to_dbl_fcnvfx(srcptr,_nullptr,dstptr,status)
> + * dbl_to_sgl_fcnvfx(srcptr,_nullptr,dstptr,status)
> + * sgl_to_dbl_fcnvfx(srcptr,_nullptr,dstptr,status)
> + * sgl_to_sgl_fcnvfx(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -44,7 +44,7 @@
> int
> sgl_to_sgl_fcnvfx(
> sgl_floating_point *srcptr,
> - sgl_floating_point *nullptr,
> + sgl_floating_point *_nullptr,
> int *dstptr,
> sgl_floating_point *status)
> {
> @@ -141,7 +141,7 @@ sgl_to_sgl_fcnvfx(
> int
> sgl_to_dbl_fcnvfx(
> sgl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_integer *dstptr,
> unsigned int *status)
> {
> @@ -262,7 +262,7 @@ sgl_to_dbl_fcnvfx(
> int
> dbl_to_sgl_fcnvfx(
> dbl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> int *dstptr,
> unsigned int *status)
> {
> @@ -373,7 +373,7 @@ dbl_to_sgl_fcnvfx(
> int
> dbl_to_dbl_fcnvfx(
> dbl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_integer *dstptr,
> unsigned int *status)
> {
> diff --git a/arch/parisc/math-emu/fcnvfxt.c b/arch/parisc/math-emu/fcnvfxt.c
> index ebec31e40d01..3b7cc62257d0 100644
> --- a/arch/parisc/math-emu/fcnvfxt.c
> +++ b/arch/parisc/math-emu/fcnvfxt.c
> @@ -18,10 +18,10 @@
> * Double Floating-point to Double Fixed-point /w truncated result
> *
> * External Interfaces:
> - * dbl_to_dbl_fcnvfxt(srcptr,nullptr,dstptr,status)
> - * dbl_to_sgl_fcnvfxt(srcptr,nullptr,dstptr,status)
> - * sgl_to_dbl_fcnvfxt(srcptr,nullptr,dstptr,status)
> - * sgl_to_sgl_fcnvfxt(srcptr,nullptr,dstptr,status)
> + * dbl_to_dbl_fcnvfxt(srcptr,_nullptr,dstptr,status)
> + * dbl_to_sgl_fcnvfxt(srcptr,_nullptr,dstptr,status)
> + * sgl_to_dbl_fcnvfxt(srcptr,_nullptr,dstptr,status)
> + * sgl_to_sgl_fcnvfxt(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -45,7 +45,7 @@
> int
> sgl_to_sgl_fcnvfxt(
> sgl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> int *dstptr,
> unsigned int *status)
> {
> @@ -109,7 +109,7 @@ sgl_to_sgl_fcnvfxt(
> int
> sgl_to_dbl_fcnvfxt(
> sgl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_integer *dstptr,
> unsigned int *status)
> {
> @@ -183,7 +183,7 @@ sgl_to_dbl_fcnvfxt(
> int
> dbl_to_sgl_fcnvfxt(
> dbl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> int *dstptr,
> unsigned int *status)
> {
> @@ -248,7 +248,7 @@ dbl_to_sgl_fcnvfxt(
> int
> dbl_to_dbl_fcnvfxt(
> dbl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_integer *dstptr,
> unsigned int *status)
> {
> diff --git a/arch/parisc/math-emu/fcnvuf.c b/arch/parisc/math-emu/fcnvufc
> index c54978a0ace1..c166feb57045 100644
> --- a/arch/parisc/math-emu/fcnvuf.c
> +++ b/arch/parisc/math-emu/fcnvuf.c
> @@ -15,10 +15,10 @@
> * Fixed point to Floating-point Converts
> *
> * External Interfaces:
> - * dbl_to_dbl_fcnvuf(srcptr,nullptr,dstptr,status)
> - * dbl_to_sgl_fcnvuf(srcptr,nullptr,dstptr,status)
> - * sgl_to_dbl_fcnvuf(srcptr,nullptr,dstptr,status)
> - * sgl_to_sgl_fcnvuf(srcptr,nullptr,dstptr,status)
> + * dbl_to_dbl_fcnvuf(srcptr,_nullptr,dstptr,status)
> + * dbl_to_sgl_fcnvuf(srcptr,_nullptr,dstptr,status)
> + * sgl_to_dbl_fcnvuf(srcptr,_nullptr,dstptr,status)
> + * sgl_to_sgl_fcnvuf(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -45,7 +45,7 @@
> int
> sgl_to_sgl_fcnvuf(
> unsigned int *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> sgl_floating_point *dstptr,
> unsigned int *status)
> {
> @@ -104,7 +104,7 @@ sgl_to_sgl_fcnvuf(
> int
> sgl_to_dbl_fcnvuf(
> unsigned int *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_floating_point *dstptr,
> unsigned int *status)
> {
> @@ -145,7 +145,7 @@ sgl_to_dbl_fcnvuf(
> int
> dbl_to_sgl_fcnvuf(
> dbl_unsigned *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> sgl_floating_point *dstptr,
> unsigned int *status)
> {
> @@ -227,7 +227,7 @@ dbl_to_sgl_fcnvuf(
> int
> dbl_to_dbl_fcnvuf(
> dbl_unsigned *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_floating_point *dstptr,
> unsigned int *status)
> {
> diff --git a/arch/parisc/math-emu/fcnvxf.c b/arch/parisc/math-emu/fcnvxfc
> index 69401797146b..11bc1e8a13aa 100644
> --- a/arch/parisc/math-emu/fcnvxf.c
> +++ b/arch/parisc/math-emu/fcnvxf.c
> @@ -18,10 +18,10 @@
> * Double Fixed-point to Double Floating-point
> *
> * External Interfaces:
> - * dbl_to_dbl_fcnvxf(srcptr,nullptr,dstptr,status)
> - * dbl_to_sgl_fcnvxf(srcptr,nullptr,dstptr,status)
> - * sgl_to_dbl_fcnvxf(srcptr,nullptr,dstptr,status)
> - * sgl_to_sgl_fcnvxf(srcptr,nullptr,dstptr,status)
> + * dbl_to_dbl_fcnvxf(srcptr,_nullptr,dstptr,status)
> + * dbl_to_sgl_fcnvxf(srcptr,_nullptr,dstptr,status)
> + * sgl_to_dbl_fcnvxf(srcptr,_nullptr,dstptr,status)
> + * sgl_to_sgl_fcnvxf(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -44,7 +44,7 @@
> int
> sgl_to_sgl_fcnvxf(
> int *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> sgl_floating_point *dstptr,
> unsigned int *status)
> {
> @@ -115,7 +115,7 @@ sgl_to_sgl_fcnvxf(
> int
> sgl_to_dbl_fcnvxf(
> int *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_floating_point *dstptr,
> unsigned int *status)
> {
> @@ -166,7 +166,7 @@ sgl_to_dbl_fcnvxf(
> int
> dbl_to_sgl_fcnvxf(
> dbl_integer *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> sgl_floating_point *dstptr,
> unsigned int *status)
> {
> @@ -271,7 +271,7 @@ dbl_to_sgl_fcnvxf(
> int
> dbl_to_dbl_fcnvxf(
> dbl_integer *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_floating_point *dstptr,
> unsigned int *status)
> {
> diff --git a/arch/parisc/math-emu/frnd.c b/arch/parisc/math-emu/frnd.c
> index 0b0e8493e08a..825d89650c2d 100644
> --- a/arch/parisc/math-emu/frnd.c
> +++ b/arch/parisc/math-emu/frnd.c
> @@ -14,8 +14,8 @@
> * Quad Floating-point Round to Integer (returns unimplemented)
> *
> * External Interfaces:
> - * dbl_frnd(srcptr,nullptr,dstptr,status)
> - * sgl_frnd(srcptr,nullptr,dstptr,status)
> + * dbl_frnd(srcptr,_nullptr,dstptr,status)
> + * sgl_frnd(srcptr,_nullptr,dstptr,status)
> *
> * END_DESC
> */
> @@ -33,7 +33,7 @@
> /*ARGSUSED*/
> int
> sgl_frnd(sgl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> sgl_floating_point *dstptr,
> unsigned int *status)
> {
> @@ -138,7 +138,7 @@ sgl_frnd(sgl_floating_point *srcptr,
> int
> dbl_frnd(
> dbl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> dbl_floating_point *dstptr,
> unsigned int *status)
> {
> diff --git a/arch/parisc/math-emu/sfsqrt.c b/arch/parisc/math-emu/sfsqrtc
> index bd6a84f468d8..8e9e023e7b2e 100644
> --- a/arch/parisc/math-emu/sfsqrt.c
> +++ b/arch/parisc/math-emu/sfsqrt.c
> @@ -15,7 +15,7 @@
> * Single Floating-point Square Root
> *
> * External Interfaces:
> - * sgl_fsqrt(srcptr,nullptr,dstptr,status)
> + * sgl_fsqrt(srcptr,_nullptr,dstptr,status)
> *
> * Internal Interfaces:
> *
> @@ -37,7 +37,7 @@
> unsigned int
> sgl_fsqrt(
> sgl_floating_point *srcptr,
> - unsigned int *nullptr,
> + unsigned int *_nullptr,
> sgl_floating_point *dstptr,
> unsigned int *status)
> {
Powered by blists - more mailing lists