add return values to return statements in non-void functions

Message ID CAENS6Ev9CdJBUt9JaFtsroSD=gC3OfnHFYBdd=hPENWGCxv8SA@mail.gmail.com
State Committed
Headers

Commit Message

David Blaikie April 12, 2014, 12:24 a.m. UTC
  These missing return values cause build breaks with clang which
defaults the -Wreturn-type warning to an error in this case.

Add the right return values so these tests can run when using clang.
commit ce1534e51863af5d935cdc63c44df0fa64a46653
Author: David Blaikie <dblaikie@gmail.com>
Date:   Fri Apr 11 17:20:49 2014 -0700

    Add return value for non-void function return statements to fix error in clang build.
    
    Clang defaults this warning to an error, breaking the build & causing
    these tests not to run.
    
    gdb/testsuite/
    
    	* gdb.mi/non-stop.c: Add return value for non-void function return
    	statement.
    	* gdb.threads/staticthreads.c: Ditto.
  

Comments

Joel Brobecker April 14, 2014, 1:03 p.m. UTC | #1
> gdb/testsuite/
>
> 	* gdb.mi/non-stop.c: Add return value for non-void function return
> 	statement.
> 	* gdb.threads/staticthreads.c: Ditto.

Looks good, thanks for doing that. Please apply.
  
David Blaikie April 14, 2014, 3:38 p.m. UTC | #2
On Mon, Apr 14, 2014 at 6:03 AM, Joel Brobecker <brobecker@adacore.com> wrote:
>> gdb/testsuite/
>>
>>       * gdb.mi/non-stop.c: Add return value for non-void function return
>>       statement.
>>       * gdb.threads/staticthreads.c: Ditto.
>
> Looks good, thanks for doing that. Please apply.

Thanks, committed as 41f1ada5d2d4cff7a235644661ec30de156fd038
  
Doug Evans April 24, 2014, 12:23 a.m. UTC | #3
David Blaikie writes:
 > These missing return values cause build breaks with clang which
 > defaults the -Wreturn-type warning to an error in this case.
 > 
 > Add the right return values so these tests can run when using clang.
 > commit ce1534e51863af5d935cdc63c44df0fa64a46653
 > Author: David Blaikie <dblaikie@gmail.com>
 > Date:   Fri Apr 11 17:20:49 2014 -0700
 > 
 >     Add return value for non-void function return statements to fix error in clang build.
 >     
 >     Clang defaults this warning to an error, breaking the build & causing
 >     these tests not to run.
 >     
 >     gdb/testsuite/
 >     
 >     	* gdb.mi/non-stop.c: Add return value for non-void function return
 >     	statement.
 >     	* gdb.threads/staticthreads.c: Ditto.

ChangeLog rules require being more specific about where the change happened.
E.g.,

	* gdb.mi/non-stop.c (worker): Add return value for non-void function
	return statement.
	* gdb.threads/staticthreads.c (thread_function): Ditto.

Ok with those changes.
Thanks!
  
Doug Evans April 24, 2014, 12:30 a.m. UTC | #4
On Wed, Apr 23, 2014 at 5:23 PM, Doug Evans <dje@google.com> wrote:
> David Blaikie writes:
>  > These missing return values cause build breaks with clang which
>  > defaults the -Wreturn-type warning to an error in this case.
>  >
>  > Add the right return values so these tests can run when using clang.
>  > commit ce1534e51863af5d935cdc63c44df0fa64a46653
>  > Author: David Blaikie <dblaikie@gmail.com>
>  > Date:   Fri Apr 11 17:20:49 2014 -0700
>  >
>  >     Add return value for non-void function return statements to fix error in clang build.
>  >
>  >     Clang defaults this warning to an error, breaking the build & causing
>  >     these tests not to run.
>  >
>  >     gdb/testsuite/
>  >
>  >      * gdb.mi/non-stop.c: Add return value for non-void function return
>  >      statement.
>  >      * gdb.threads/staticthreads.c: Ditto.
>
> ChangeLog rules require being more specific about where the change happened.
> E.g.,
>
>         * gdb.mi/non-stop.c (worker): Add return value for non-void function
>         return statement.
>         * gdb.threads/staticthreads.c (thread_function): Ditto.
>
> Ok with those changes.
> Thanks!

Bleah.  Missed that this one was also already approved.
[that's what I get for switching back and forth between mail readers]
  
David Blaikie April 24, 2014, 8:26 p.m. UTC | #5
On Wed, Apr 23, 2014 at 5:30 PM, Doug Evans <dje@google.com> wrote:
> On Wed, Apr 23, 2014 at 5:23 PM, Doug Evans <dje@google.com> wrote:
>> David Blaikie writes:
>>  > These missing return values cause build breaks with clang which
>>  > defaults the -Wreturn-type warning to an error in this case.
>>  >
>>  > Add the right return values so these tests can run when using clang.
>>  > commit ce1534e51863af5d935cdc63c44df0fa64a46653
>>  > Author: David Blaikie <dblaikie@gmail.com>
>>  > Date:   Fri Apr 11 17:20:49 2014 -0700
>>  >
>>  >     Add return value for non-void function return statements to fix error in clang build.
>>  >
>>  >     Clang defaults this warning to an error, breaking the build & causing
>>  >     these tests not to run.
>>  >
>>  >     gdb/testsuite/
>>  >
>>  >      * gdb.mi/non-stop.c: Add return value for non-void function return
>>  >      statement.
>>  >      * gdb.threads/staticthreads.c: Ditto.
>>
>> ChangeLog rules require being more specific about where the change happened.
>> E.g.,
>>
>>         * gdb.mi/non-stop.c (worker): Add return value for non-void function
>>         return statement.
>>         * gdb.threads/staticthreads.c (thread_function): Ditto.
>>
>> Ok with those changes.
>> Thanks!
>
> Bleah.  Missed that this one was also already approved.
> [that's what I get for switching back and forth between mail readers]

No worries - I'll try to keep that in mind for future ChangeLogs. (I
assume it's preferred not to go back and fix the ChangeLog that was
already committed in this instance)
  
Doug Evans April 24, 2014, 8:32 p.m. UTC | #6
On Thu, Apr 24, 2014 at 1:26 PM, David Blaikie <dblaikie@gmail.com> wrote:
>> Bleah.  Missed that this one was also already approved.
>> [that's what I get for switching back and forth between mail readers]
>
> No worries - I'll try to keep that in mind for future ChangeLogs. (I
> assume it's preferred not to go back and fix the ChangeLog that was
> already committed in this instance)

Ok by me to leave it as is.
  

Patch

diff --git gdb/testsuite/ChangeLog gdb/testsuite/ChangeLog
index 12ed4f9..1b26439 100644
--- gdb/testsuite/ChangeLog
+++ gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@ 
+2014-04-10  David Blaikie <dblaikie@gmail.com>
+
+	* gdb.mi/non-stop.c: Add return value for non-void function return
+	statement.
+	* gdb.threads/staticthreads.c: Ditto.
+
 2014-04-10  Pedro Alves  <palves@redhat.com>
 
 	* gdb.base/cond-eval-mode.c: New file.
diff --git gdb/testsuite/gdb.mi/non-stop.c gdb/testsuite/gdb.mi/non-stop.c
index f03180e..67b68aa 100644
--- gdb/testsuite/gdb.mi/non-stop.c
+++ gdb/testsuite/gdb.mi/non-stop.c
@@ -56,7 +56,7 @@  worker (void *arg)
 	unslept = sleep (unslept);
 
       if (exit_first_thread && id == 0)
-	return;
+	return NULL;
 
       break_at_me (id, i);
     }
diff --git gdb/testsuite/gdb.threads/staticthreads.c gdb/testsuite/gdb.threads/staticthreads.c
index f98f4f1..e834d7f 100644
--- gdb/testsuite/gdb.threads/staticthreads.c
+++ gdb/testsuite/gdb.threads/staticthreads.c
@@ -37,7 +37,7 @@  thread_function (void *arg)
       if (errno != EINTR)
 	{
 	  perror ("thread_function");
-	  return;
+	  return NULL;
 	}
     }
   return NULL;