[glibc/zack/no-nested-includes] Fix build warnings in nptl/tst-eintr1.c

[glibc/zack/no-nested-includes] Fix build warnings in nptl/tst-eintr1.c

[Zack Weinberg]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="us-ascii", Size: 1941 bytes --]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c78b3f55d12c3599c5492b1883a48e5e3c391ccf

commit c78b3f55d12c3599c5492b1883a48e5e3c391ccf
Author: Stefan Liebler <stli@linux.ibm.com>
Date:   Wed Jun 26 12:29:50 2019 +0200

    Fix build warnings in nptl/tst-eintr1.c
    
    This patch fixes the gcc warnings seen with gcc 9.1 -O3 on s390x:
    tst-eintr1.c: In function ‘tf1’:
    tst-eintr1.c:46:1: error: no return statement in function returning non-void [-Werror=return-type]
       46 | }
          | ^
    tst-eintr1.c: In function ‘do_test’:
    tst-eintr1.c:57:17: error: unused variable ‘th’ [-Werror=unused-variable]
       57 |       pthread_t th = xpthread_create (NULL, tf1, NULL);
          |                 ^~
    
    ChangeLog:
    
    	* nptl/tst-eintr1.c (tf1): Add return statement.
    	(do_test): Remove unused th variable.

Diff:
---
 ChangeLog         | 5 +++++
 nptl/tst-eintr1.c | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index adc58e4..2e54659 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2019-06-26  Stefan Liebler  <stli@linux.ibm.com>
 
+	* nptl/tst-eintr1.c (tf1): Add return statement.
+	(do_test): Remove unused th variable.
+
+2019-06-26  Stefan Liebler  <stli@linux.ibm.com>
+
 	* locale/programs/ld-ctype.c (charclass_symbolic_ellipsis):
 	Return error if get_character fails.
 
diff --git a/nptl/tst-eintr1.c b/nptl/tst-eintr1.c
index b60b796..11404ff 100644
--- a/nptl/tst-eintr1.c
+++ b/nptl/tst-eintr1.c
@@ -43,6 +43,7 @@ tf1 (void *arg)
       pthread_t th = xpthread_create (NULL, tf2, NULL);
       xpthread_join (th);
     }
+  return NULL;
 }
 
 
@@ -53,9 +54,7 @@ do_test (void)
 
   int i;
   for (i = 0; i < 10; ++i)
-    {
-      pthread_t th = xpthread_create (NULL, tf1, NULL);
-    }
+    xpthread_create (NULL, tf1, NULL);
 
   delayed_exit (3);
   /* This call must never return.  */