about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-08-26 17:33:47 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-08-26 17:33:47 -0300
commit21e79af4cf72429f98480fa34912a4ce236b09a0 (patch)
tree1a901ba7cb48d7c36c0b2b6a129c2d01d61f314d
parent5a7ac040efe94f8c49c5ec95c90ad6baf3b37744 (diff)
downloadglibc-21e79af4cf72429f98480fa34912a4ce236b09a0.tar.gz
glibc-21e79af4cf72429f98480fa34912a4ce236b09a0.tar.xz
glibc-21e79af4cf72429f98480fa34912a4ce236b09a0.zip
Fix test-skeleton C99 designed initialization
ISO C forbids empty initializer braces (6.7.9 initializer-list must
contain at least one initializer). However GCC allows it, generating
a warning depending of the version.

With GCC 4.8 on ARM I noticed tst-initializers1.c fails to build with:

In file included from tst-initializers1.c:60:0:
../test-skeleton.c: In function 'delayed_exit_thread':
../test-skeleton.c:687:10: error: missing initializer for field 'tv_sec' of 'struct timespec' [-Werror=missing-field-initializers]
   struct timespec remaining = {}

While with GCC 5.1 the same warning is just spilled with -pedantic.
To be safe this patch just zero initialize the struct as expected.

Tested on armhf.

	* test-skeleton.c (delayed_exit_thread): Add initializer on struct
	timespec C99 designated initialization.
-rw-r--r--ChangeLog5
-rw-r--r--test-skeleton.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index be65e09019..995b440c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-26  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* test-skeleton.c (delayed_exit_thread): Add initializer on struct
+	timespec C99 designated initialization.
+
 2016-08-26  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #19946]
diff --git a/test-skeleton.c b/test-skeleton.c
index b24ce1d834..913a335782 100644
--- a/test-skeleton.c
+++ b/test-skeleton.c
@@ -684,7 +684,7 @@ delayed_exit_thread (void *seconds_as_ptr)
 {
   int seconds = (uintptr_t) seconds_as_ptr;
   struct timespec delay = { seconds, 0 };
-  struct timespec remaining = {};
+  struct timespec remaining = { 0 };
   if (nanosleep (&delay, &remaining) != 0)
     {
       printf ("error: nanosleep: %m\n");