Message ID | alpine.DEB.2.21.1902181825530.12080@digraph.polyomino.org.uk |
---|---|
State | New |
Headers | show |
Series | Fix -Wempty-body warnings in system-specific code | expand |
On Feb 18 2019, Joseph Myers <joseph@codesourcery.com> wrote: > diff --git a/sysdeps/m68k/wcpcpy.c b/sysdeps/m68k/wcpcpy.c > index a4bac08308..daeffc8f9b 100644 > --- a/sysdeps/m68k/wcpcpy.c > +++ b/sysdeps/m68k/wcpcpy.c > @@ -27,7 +27,8 @@ wchar_t * > __wcpcpy (wchar_t *dest, const wchar_t *src) > { > do > - ; > + { > + } > while ((*dest++ = *src++)); There is no point in using do..while here. Andreas.
On 18/02/2019 16:55, Andreas Schwab wrote: > On Feb 18 2019, Joseph Myers <joseph@codesourcery.com> wrote: > >> diff --git a/sysdeps/m68k/wcpcpy.c b/sysdeps/m68k/wcpcpy.c >> index a4bac08308..daeffc8f9b 100644 >> --- a/sysdeps/m68k/wcpcpy.c >> +++ b/sysdeps/m68k/wcpcpy.c >> @@ -27,7 +27,8 @@ wchar_t * >> __wcpcpy (wchar_t *dest, const wchar_t *src) >> { >> do >> - ; >> + { >> + } >> while ((*dest++ = *src++)); > > There is no point in using do..while here. > > Andreas. > Can't we just use my 'wcsmbs: optimize wcpcpy' [1] instead? [1] https://sourceware.org/ml/libc-alpha/2019-02/msg00155.html
On Mon, 18 Feb 2019, Adhemerval Zanella wrote: > Can't we just use my 'wcsmbs: optimize wcpcpy' [1] instead? > > [1] https://sourceware.org/ml/libc-alpha/2019-02/msg00155.html That looks like it would also deal with the issue for that file, yes (while the hurdinit.c change would still be needed).
Ping. This patch <https://sourceware.org/ml/libc-alpha/2019-02/msg00452.html> is pending review. (Disregarding the m68k-specific change if people prefer to cover that with another patch.)
* Joseph Myers: > diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c > index 773bb1c37f..2a224638ca 100644 > --- a/hurd/hurdinit.c > +++ b/hurd/hurdinit.c > @@ -100,10 +100,12 @@ _hurd_init (int flags, char **argv, > portarraysize * sizeof (mach_port_t)); > > if (flags & EXEC_SECURE) > - /* XXX if secure exec, elide environment variables > - which the library uses and could be security holes. > - CORESERVER, COREFILE > - */ ; > + { > + /* XXX if secure exec, elide environment variables > + which the library uses and could be security holes. > + CORESERVER, COREFILE > + */ > + } > > /* Call other things which want to do some initialization. These are not > on the __libc_subinit hook because things there like to be able to The change looks okay to me, although this to-do does look a bit scary. > diff --git a/sysdeps/m68k/wcpcpy.c b/sysdeps/m68k/wcpcpy.c > index a4bac08308..daeffc8f9b 100644 > --- a/sysdeps/m68k/wcpcpy.c > +++ b/sysdeps/m68k/wcpcpy.c > @@ -27,7 +27,8 @@ wchar_t * > __wcpcpy (wchar_t *dest, const wchar_t *src) > { > do > - ; > + { > + } > while ((*dest++ = *src++)); > > return dest - 1; Adhemerval deleted this file, so this is no longer needed. Thanks, Florian
diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c index 773bb1c37f..2a224638ca 100644 --- a/hurd/hurdinit.c +++ b/hurd/hurdinit.c @@ -100,10 +100,12 @@ _hurd_init (int flags, char **argv, portarraysize * sizeof (mach_port_t)); if (flags & EXEC_SECURE) - /* XXX if secure exec, elide environment variables - which the library uses and could be security holes. - CORESERVER, COREFILE - */ ; + { + /* XXX if secure exec, elide environment variables + which the library uses and could be security holes. + CORESERVER, COREFILE + */ + } /* Call other things which want to do some initialization. These are not on the __libc_subinit hook because things there like to be able to diff --git a/sysdeps/m68k/wcpcpy.c b/sysdeps/m68k/wcpcpy.c index a4bac08308..daeffc8f9b 100644 --- a/sysdeps/m68k/wcpcpy.c +++ b/sysdeps/m68k/wcpcpy.c @@ -27,7 +27,8 @@ wchar_t * __wcpcpy (wchar_t *dest, const wchar_t *src) { do - ; + { + } while ((*dest++ = *src++)); return dest - 1;