From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 30 Sep 2008 06:34:56 +0000 (+0200)
Subject: tests: avoid some compiler warnings
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=47bf1430c04eb59f70e74f8b402a5ea23e5b891c;p=pspp

tests: avoid some compiler warnings
* tests/test-memchr.c (main): Pass NULL indirectly.
* tests/test-getdate.c (main): Remove unused variable 'ret'.

Signed-off-by: Simon Josefsson <simon@josefsson.org>
---

diff --git a/ChangeLog b/ChangeLog
index 295178d0b3..df51cfd4d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-15  Simon Josefsson  <simon@josefsson.org>
+
+	tests: avoid some compiler warnings
+	* tests/test-memchr.c (main): Pass NULL indirectly.
+	* tests/test-getdate.c (main): Remove unused variable 'ret'.
+
 2008-09-29  Ondřej Vašík  <ovasik@redhat.com>
 
 	getdate.y: disallow countable dayshifts like "4 yesterday ago"
diff --git a/tests/test-getdate.c b/tests/test-getdate.c
index 874d918e20..3433c09fb3 100644
--- a/tests/test-getdate.c
+++ b/tests/test-getdate.c
@@ -49,7 +49,6 @@
 int
 main (int argc, char **argv)
 {
-  bool ret;
   struct timespec result;
   struct timespec result2;
   struct timespec now;
diff --git a/tests/test-memrchr.c b/tests/test-memrchr.c
index 84f6c5b8b2..f829a226ae 100644
--- a/tests/test-memrchr.c
+++ b/tests/test-memrchr.c
@@ -41,6 +41,8 @@
 int
 main ()
 {
+  void *nil = NULL; /* Use to avoid gcc attribute((nonnull)) warnings.  */
+
   size_t n = 0x100000;
   char *input = malloc (n);
   ASSERT (input);
@@ -56,7 +58,7 @@ main ()
   ASSERT (MEMRCHR (input, 'a', n) == input + n - 1);
 
   ASSERT (MEMRCHR (input, 'a', 0) == NULL);
-  ASSERT (MEMRCHR (NULL, 'a', 0) == NULL);
+  ASSERT (MEMRCHR (nil, 'a', 0) == NULL);
 
   ASSERT (MEMRCHR (input, 'b', n) == input + n - 2);
   ASSERT (MEMRCHR (input, 'c', n) == input + n - 3);