summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--m4/setenv.m44
-rw-r--r--tests/test-fcntl.c2
-rw-r--r--tests/test-freopen-safer.c2
-rw-r--r--tests/test-fseeko.c2
-rw-r--r--tests/test-ftello.c2
-rw-r--r--tests/test-nanosleep.c2
-rw-r--r--tests/test-sleep.c2
-rw-r--r--tests/test-unsetenv.c2
-rw-r--r--tests/test-xalloc-die.c2
10 files changed, 24 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a70eb78f5..28f92b027e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-23 Eric Blake <ebb9@byu.net>
+
+ tests: avoid compiler warnings
+ * tests/test-fcntl.c (main): Delete unused parameters.
+ * tests/test-freopen-safer.c (main): Likewise.
+ * tests/test-xalloc-die.c (main): Mark unused parameters.
+ * tests/test-fseeko.c (main): Likewise.
+ * tests/test-ftello.c (main): Likewise.
+ * tests/test-nanosleep.c (main): Avoid declaration warning.
+ * tests/test-sleep.c (main): Likewise.
+ * tests/test-unsetenv.c (main): Silence warning about string
+ literal.
+ * m4/setenv.m4 (gl_FUNC_UNSETENV): Likewise.
+
2009-12-23 Bruno Haible <bruno@clisp.org>
* tests/test-localename.c (test_locale_name): New function, extracted
diff --git a/m4/setenv.m4 b/m4/setenv.m4
index 29e6866742..a4cfb9ecea 100644
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -1,4 +1,4 @@
-# setenv.m4 serial 14
+# setenv.m4 serial 15
dnl Copyright (C) 2001-2004, 2006-2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -77,7 +77,7 @@ int unsetenv();
#include <stdlib.h>
]], [[
char entry[] = "b=2";
- if (putenv ("a=1")) return 1;
+ if (putenv ((char *) "a=1")) return 1;
if (putenv (entry)) return 2;
entry[0] = 'a';
unsetenv ("a");
diff --git a/tests/test-fcntl.c b/tests/test-fcntl.c
index 8ea130101d..c06b41e618 100644
--- a/tests/test-fcntl.c
+++ b/tests/test-fcntl.c
@@ -220,7 +220,7 @@ check_flags (void)
}
int
-main (int argc, char **argv)
+main (void)
{
const char *file = "test-fcntl.tmp";
int fd;
diff --git a/tests/test-freopen-safer.c b/tests/test-freopen-safer.c
index d1bbe8d57a..40ba8872d4 100644
--- a/tests/test-freopen-safer.c
+++ b/tests/test-freopen-safer.c
@@ -45,7 +45,7 @@ static FILE *myerr;
while (0)
int
-main (int argc, char **argv)
+main (void)
{
FILE *fp;
diff --git a/tests/test-fseeko.c b/tests/test-fseeko.c
index 4006e1ebed..037c7f5ecd 100644
--- a/tests/test-fseeko.c
+++ b/tests/test-fseeko.c
@@ -45,7 +45,7 @@
#endif
int
-main (int argc, char **argv)
+main (int argc, char **argv _UNUSED_PARAMETER_)
{
/* Assume stdin is non-empty, seekable, and starts with '#!/bin/sh'
iff argc > 1. */
diff --git a/tests/test-ftello.c b/tests/test-ftello.c
index f3183c8ecd..ab5c456552 100644
--- a/tests/test-ftello.c
+++ b/tests/test-ftello.c
@@ -46,7 +46,7 @@
#endif
int
-main (int argc, char **argv)
+main (int argc, char **argv _UNUSED_PARAMETER_)
{
int ch;
/* Assume stdin is seekable iff argc > 1. */
diff --git a/tests/test-nanosleep.c b/tests/test-nanosleep.c
index eb4bef67a3..426ea999f1 100644
--- a/tests/test-nanosleep.c
+++ b/tests/test-nanosleep.c
@@ -50,7 +50,7 @@ handle_alarm (int sig)
#endif
int
-main()
+main (void)
{
struct timespec ts;
diff --git a/tests/test-sleep.c b/tests/test-sleep.c
index 48abce12f6..8840142ac9 100644
--- a/tests/test-sleep.c
+++ b/tests/test-sleep.c
@@ -46,7 +46,7 @@ handle_alarm (int sig)
#endif
int
-main()
+main (void)
{
ASSERT (sleep (1) <= 1);
diff --git a/tests/test-unsetenv.c b/tests/test-unsetenv.c
index 2815cf3a39..bd312a04b5 100644
--- a/tests/test-unsetenv.c
+++ b/tests/test-unsetenv.c
@@ -43,7 +43,7 @@ main (void)
char entry[] = "b=2";
/* Test removal when multiple entries present. */
- ASSERT (putenv ("a=1") == 0);
+ ASSERT (putenv ((char *) "a=1") == 0);
ASSERT (putenv (entry) == 0);
entry[0] = 'a'; /* Unspecified what getenv("a") would be at this point. */
ASSERT (unsetenv ("a") == 0); /* Both entries will be removed. */
diff --git a/tests/test-xalloc-die.c b/tests/test-xalloc-die.c
index 4a03a0bc57..8b190d062a 100644
--- a/tests/test-xalloc-die.c
+++ b/tests/test-xalloc-die.c
@@ -22,7 +22,7 @@
#include "progname.h"
int
-main (int argc, char **argv)
+main (int argc _UNUSED_PARAMETER_, char **argv)
{
set_program_name (argv[0]);
xalloc_die ();