From df81ab2911ce995fb9e116550b7a6798b497e391 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Wed, 5 Nov 2003 03:53:19 +0000
Subject: Cast NULL to `(char *)' in call to variadic function,
 parse_long_options, so that it works even on systems for which sizeof char*
 != sizeof int.

---
 src/basename.c  | 2 +-
 src/chroot.c    | 2 +-
 src/cksum.c     | 2 +-
 src/dd.c        | 2 +-
 src/dirname.c   | 2 +-
 src/echo.c      | 2 +-
 src/expr.c      | 2 +-
 src/factor.c    | 2 +-
 src/hostid.c    | 2 +-
 src/hostname.c  | 2 +-
 src/link.c      | 2 +-
 src/logname.c   | 2 +-
 src/nice.c      | 2 +-
 src/nohup.c     | 2 +-
 src/pathchk.c   | 2 +-
 src/printenv.c  | 2 +-
 src/printf.c    | 2 +-
 src/pwd.c       | 2 +-
 src/setuidgid.c | 2 +-
 src/sleep.c     | 2 +-
 src/stty.c      | 2 +-
 src/sync.c      | 2 +-
 src/test.c      | 2 +-
 src/tsort.c     | 2 +-
 src/unlink.c    | 2 +-
 src/uptime.c    | 2 +-
 src/users.c     | 2 +-
 src/whoami.c    | 2 +-
 src/yes.c       | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/basename.c b/src/basename.c
index 9ba33c357..2bf1630cb 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -100,7 +100,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
   if (argc > 1 && STREQ (argv[1], "--"))
diff --git a/src/chroot.c b/src/chroot.c
index d808908b4..8095f2ec1 100644
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
   if (argc <= 1)
     {
       error (0, 0, _("too few arguments"));
diff --git a/src/cksum.c b/src/cksum.c
index c991181d5..9253d9b16 100644
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -309,7 +309,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   have_read_stdin = 0;
 
diff --git a/src/dd.c b/src/dd.c
index 5300d3b4a..6ab7c3d43 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -1161,7 +1161,7 @@ main (int argc, char **argv)
   atexit (close_stdout_wrapper);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   /* Don't close stdout on exit from here on.  */
   closeout_func = NULL;
diff --git a/src/dirname.c b/src/dirname.c
index 9eee8221b..347623dbc 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -75,7 +75,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
   if (argc > 1 && STREQ (argv[1], "--"))
diff --git a/src/echo.c b/src/echo.c
index 658ceea20..bd79cc96c 100644
--- a/src/echo.c
+++ b/src/echo.c
@@ -127,7 +127,7 @@ main (int argc, char **argv)
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL, NULL);
+		      usage, AUTHORS, (char const *) NULL, NULL);
   else
     allow_options = 0;
 
diff --git a/src/expr.c b/src/expr.c
index 8b7562162..f75fb8ed9 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -188,7 +188,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
   if (argc > 1 && STREQ (argv[1], "--"))
diff --git a/src/factor.c b/src/factor.c
index 03be10609..f10582692 100644
--- a/src/factor.c
+++ b/src/factor.c
@@ -202,7 +202,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
   if (argc > 1 && STREQ (argv[1], "--"))
diff --git a/src/hostid.c b/src/hostid.c
index 1f89fda70..1f10480a3 100644
--- a/src/hostid.c
+++ b/src/hostid.c
@@ -69,7 +69,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   if (argc > 1)
     {
diff --git a/src/hostname.c b/src/hostname.c
index 5aedf29e7..52c1892f4 100644
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -91,7 +91,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)
diff --git a/src/link.c b/src/link.c
index d0ae1ed4d..41d4a7122 100644
--- a/src/link.c
+++ b/src/link.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
diff --git a/src/logname.c b/src/logname.c
index a10de9f7a..455cea63a 100644
--- a/src/logname.c
+++ b/src/logname.c
@@ -72,7 +72,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
diff --git a/src/nice.c b/src/nice.c
index 003fa1f8e..6d2595998 100644
--- a/src/nice.c
+++ b/src/nice.c
@@ -99,7 +99,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   for (i = 1; i < argc; /* empty */)
     {
diff --git a/src/nohup.c b/src/nohup.c
index a8772f84d..6d006f216 100644
--- a/src/nohup.c
+++ b/src/nohup.c
@@ -86,7 +86,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   /* The above handles --help and --version.
      Now, handle `--'.  */
diff --git a/src/pathchk.c b/src/pathchk.c
index 17638de66..40178cc4c 100644
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -166,7 +166,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   while ((optc = getopt_long (argc, argv, "p", longopts, NULL)) != -1)
     {
diff --git a/src/printenv.c b/src/printenv.c
index 033e98e1d..a956d250d 100644
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -94,7 +94,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
diff --git a/src/printf.c b/src/printf.c
index b5d1cb511..f3ad46284 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -566,7 +566,7 @@ main (int argc, char **argv)
   posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL);
   if (!posixly_correct)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-			usage, AUTHORS, NULL);
+			usage, AUTHORS, (char const *) NULL);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
diff --git a/src/pwd.c b/src/pwd.c
index 17a80a69e..596473449 100644
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -68,7 +68,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   if (1 < argc)
     error (0, 0, _("ignoring non-option arguments"));
diff --git a/src/setuidgid.c b/src/setuidgid.c
index e19acf3cf..79e743829 100644
--- a/src/setuidgid.c
+++ b/src/setuidgid.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
diff --git a/src/sleep.c b/src/sleep.c
index 9e986930c..9c96ab38d 100644
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -120,7 +120,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
diff --git a/src/stty.c b/src/stty.c
index d47ab2f27..ec7b5278e 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -750,7 +750,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   output_type = changed;
   verbose_output = 0;
diff --git a/src/sync.c b/src/sync.c
index 13e53f670..6d98b5d4f 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -65,7 +65,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   if (1 < argc)
     error (0, 0, _("ignoring all arguments"));
diff --git a/src/test.c b/src/test.c
index 24d347e64..9cd691acf 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1101,7 +1101,7 @@ main (int margc, char **margv)
       if (margc < 2 || strcmp (margv[margc - 1], "]") != 0)
 	{
 	  parse_long_options (margc, margv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-			      usage, AUTHORS, NULL);
+			      usage, AUTHORS, (char const *) NULL);
 	  test_syntax_error (_("missing `]'\n"), NULL);
 	}
 
diff --git a/src/tsort.c b/src/tsort.c
index 3cae86d20..bf680c577 100644
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -560,7 +560,7 @@ main (int argc, char **argv)
   exit_status = 0;
 
   parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     switch (opt)
diff --git a/src/unlink.c b/src/unlink.c
index 6d3257e36..f283b17cf 100644
--- a/src/unlink.c
+++ b/src/unlink.c
@@ -74,7 +74,7 @@ main (int argc, char **argv)
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-			usage, AUTHORS, NULL);
+			usage, AUTHORS, (char const *) NULL);
 
   /* The above handles --help and --version.
      Since there is no other invocation of getopt, handle `--' here.  */
diff --git a/src/uptime.c b/src/uptime.c
index 371e60b47..b039f01e5 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -216,7 +216,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
     {
diff --git a/src/users.c b/src/users.c
index d53d33708..7fbc8c604 100644
--- a/src/users.c
+++ b/src/users.c
@@ -143,7 +143,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   while ((optc = getopt_long (argc, argv, "", longopts, &longind)) != -1)
     {
diff --git a/src/whoami.c b/src/whoami.c
index c113ba35d..8b4318d4e 100644
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -77,7 +77,7 @@ main (int argc, char **argv)
   atexit (close_stdout);
 
   parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-		      usage, AUTHORS, NULL);
+		      usage, AUTHORS, (char const *) NULL);
 
   while ((c = getopt_long (argc, argv, "", long_options, NULL)) != -1)
     {
diff --git a/src/yes.c b/src/yes.c
index 65e5342e0..e58d63fba 100644
--- a/src/yes.c
+++ b/src/yes.c
@@ -74,7 +74,7 @@ main (int argc, char **argv)
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
     parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
-			usage, AUTHORS, NULL);
+			usage, AUTHORS, (char const *) NULL);
 
   if (argc == 1)
     {
-- 
cgit v1.2.3-70-g09d2