[PATCH][ada][PR65490] Fix bzero warning in child_setup_tty

[PATCH][ada][PR65490] Fix bzero warning in child_setup_tty

[Tom de Vries]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

Hi,

This patch fixes the warning:
...
terminals.c:1266:21: warning: argument to ‘sizeof’ in ‘bzero’ call is the same 
expression as the destination; did you mean to remove the addressof? 
[-Wsizeof-pointer-memaccess]
...

bootstrapped and reg-tested on x86_64.

OK for stage 4/stage1?

Thanks,
- Tom

[-- Attachment #2: 0001-Fix-bzero-warning-in-child_setup_tty.patch --]
[-- Type: text/x-patch, Size: 761 bytes --]

Fix bzero warning in child_setup_tty

2015-03-30  Tom de Vries  <tom@codesourcery.com>

	PR ada/65490
	* terminals.c (child_setup_tty): Fix warning 'argument to sizeof in
	bzero call is the same expression as the destination'.
---
 gcc/ada/terminals.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
index a46e610..eaaf1c2 100644
--- a/gcc/ada/terminals.c
+++ b/gcc/ada/terminals.c
@@ -1262,8 +1262,8 @@ child_setup_tty (int fd)
   struct termios s;
   int    status;
 
-  /* ensure that s is filled with 0 */
-  bzero (&s, sizeof (&s));
+  /* Ensure that s is filled with 0.  */
+  bzero (&s, sizeof (s));
 
   /* Get the current terminal settings */
   status = tcgetattr (fd, &s);
-- 
1.9.1

Re: [PATCH][ada][PR65490] Fix bzero warning in child_setup_tty

[Arnaud Charlet]

> OK for stage 4/stage1?
> 
> Thanks,
> - Tom

> Fix bzero warning in child_setup_tty
> 
> 2015-03-30  Tom de Vries  <tom@codesourcery.com>
> 
> 	PR ada/65490
> 	* terminals.c (child_setup_tty): Fix warning 'argument to sizeof in
> 	bzero call is the same expression as the destination'.
> ---
>  gcc/ada/terminals.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
> index a46e610..eaaf1c2 100644
> --- a/gcc/ada/terminals.c
> +++ b/gcc/ada/terminals.c
> @@ -1262,8 +1262,8 @@ child_setup_tty (int fd)
>    struct termios s;
>    int    status;
>  
> -  /* ensure that s is filled with 0 */
> -  bzero (&s, sizeof (&s));
> +  /* Ensure that s is filled with 0.  */

Please keep the comment as is, we do not put dots on single partial sentences
(otherwise you would have to change these everywhere, and you and I do not
really want that).

> +  bzero (&s, sizeof (s));

the above single line change is OK for stage 4, thanks.

Arno

Re: [PATCH][ada][PR65490] Fix bzero warning in child_setup_tty

[Arnaud Charlet]

> > -  /* ensure that s is filled with 0 */
> > -  bzero (&s, sizeof (&s));
> > +  /* Ensure that s is filled with 0.  */
> 
> Please keep the comment as is, we do not put dots on single partial sentences
> (otherwise you would have to change these everywhere, and you and I do not
> really want that).
> 
> > +  bzero (&s, sizeof (s));
> 
> the above single line change is OK for stage 4, thanks.

Plus the copyright update (to 2015).

--
--- terminals.c (revision 313797)
+++ terminals.c (working copy)
@@ -6,7 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *                     Copyright (C) 2008-2014, AdaCore                     *
+ *                     Copyright (C) 2008-2015, AdaCore                     *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -1263,7 +1263,7 @@
   int    status;

   /* ensure that s is filled with 0 */
-  bzero (&s, sizeof (&s));
+  bzero (&s, sizeof (s));

   /* Get the current terminal settings */
   status = tcgetattr (fd, &s);