[PATCH][Ada] Fix syntax errors in expect.c

[PATCH][Ada] Fix syntax errors in expect.c

[Andris Pavēnis]

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

Noticed trivial syntax errors in gcc/ada/expect.c when tried to compile gcc 13.2 as cross-compiler 
for target i686-pc-msdosdjgpp.

Errors were there since

Tiedostossa, joka sisällytettiin kohdasta expect.c:54:
expect.c:Funktio ”__gnat_waitpid”:
expect.c:353:13:virhe: expected ”(” before numeric constant
  353 |   } else if WIFSTOPPED(status) {
      | ^~~~~~~~~~
expect.c:358:1:varoitus: ei-void-tyyppisen funktion loppu saavutettu [-Wreturn-type]
  358 | }
      | ^
make[5]: *** [../gcc-interface/Makefile:297: expect.o] Error 1

Errors were there since commit 9e6274e0a3b60e77a42784c3fb6ef2aa3cfc071a(Wed Dec 15 19:26:50 2021 
+0600)

Fixing these errors (attached patch for master branch) was not sufficient for building Ada 
cross-compiler, but it fixed compiler errors.

This would perhaps qualify for trivial change, but it seems that I no more have write access (I got 
it in 2015, but have not used it for a long time. Perhaps I do not really need it)


Andris





[-- Attachment #2: expect.c.patch --]
[-- Type: text/x-patch, Size: 749 bytes --]

commit 64c48aa99656e06d5728bf5837da3bbc50ae4cc5
Author: Andris Pavēnis <andris.pavenis@fmi.fi>
Date:   Sat Aug 19 10:40:22 2023 +0300

    Fix syntax error
    
    gcc/ada/expect.c(__gnat_waitpid):
            fix syntax errors

diff --git a/gcc/ada/expect.c b/gcc/ada/expect.c
index e6899632bc9..7333c11d954 100644
--- a/gcc/ada/expect.c
+++ b/gcc/ada/expect.c
@@ -346,11 +346,11 @@ __gnat_waitpid (int pid)
      return -1;
   }
 
-  if WIFEXITED (status) {
+  if (WIFEXITED (status)) {
      status = WEXITSTATUS (status);
-  } else if WIFSIGNALED (status) {
+  } else if (WIFSIGNALED (status)) {
      status = WTERMSIG (status);
-  } else if WIFSTOPPED (status) {
+  } else if (WIFSTOPPED (status)) {
      status = WSTOPSIG (status);
   }
 

Re: [PATCH][Ada] Fix syntax errors in expect.c

[Arnaud Charlet]

Change is OK, thanks!

> Noticed trivial syntax errors in gcc/ada/expect.c when tried to compile gcc
> 13.2 as cross-compiler for target i686-pc-msdosdjgpp.
> 
> Errors were there since
> 
> Tiedostossa, joka sisällytettiin kohdasta expect.c:54:
> expect.c:Funktio ”__gnat_waitpid”:
> expect.c:353:13:virhe: expected ”(” before numeric constant
>  353 |   } else if WIFSTOPPED(status) {
>      | ^~~~~~~~~~
> expect.c:358:1:varoitus: ei-void-tyyppisen funktion loppu saavutettu [-Wreturn-type]
>  358 | }
>      | ^
> make[5]: *** [../gcc-interface/Makefile:297: expect.o] Error 1
> 
> Errors were there since commit 9e6274e0a3b60e77a42784c3fb6ef2aa3cfc071a(Wed
> Dec 15 19:26:50 2021 +0600)
> 
> Fixing these errors (attached patch for master branch) was not sufficient
> for building Ada cross-compiler, but it fixed compiler errors.
> 
> This would perhaps qualify for trivial change, but it seems that I no more
> have write access (I got it in 2015, but have not used it for a long time.
> Perhaps I do not really need it)
> 
> Andris
> 
> commit 64c48aa99656e06d5728bf5837da3bbc50ae4cc5
> Author: Andris Pavēnis <andris.pavenis@fmi.fi>
> Date:   Sat Aug 19 10:40:22 2023 +0300
> 
>     Fix syntax error
>     
>     gcc/ada/expect.c(__gnat_waitpid):
>             fix syntax errors

Re: [PATCH][Ada] Fix syntax errors in expect.c

[Marc Poulhiès]

Andris Pavēnis <andris.pavenis@iki.fi> writes:

> Fixing these errors (attached patch for master branch) was not sufficient for
> building Ada cross-compiler, but it fixed compiler errors.
>
> This would perhaps qualify for trivial change, but it seems that I no more have
> write access (I got it in 2015, but have not used it for a long time. Perhaps I
> do not really need it)

Hello,

I've merged you patch as r14-5332.

Thanks!
Marc