From 42cd1376ed08bcb940eac352b2755a77ad9c81e3 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Wed, 18 Jun 2003 07:57:26 +0000
Subject: [PATCH] (PARAMS): Remove.  All uses removed.

---
 lib/mountlist.h    | 10 +---------
 lib/path-concat.h  | 11 +----------
 lib/posixtm.h      | 11 +----------
 lib/quote.h        | 12 ++----------
 lib/readutmp.h     | 20 ++------------------
 lib/savedir.h      | 10 +---------
 lib/strtoimax.c    | 16 ++++------------
 lib/unistd-safer.h | 10 +---------
 lib/version-etc.h  | 15 +++------------
 lib/xreadlink.h    | 10 +---------
 lib/xstrtod.h      | 11 +----------
 11 files changed, 18 insertions(+), 118 deletions(-)

diff --git a/lib/mountlist.h b/lib/mountlist.h
index 8aab8ff959..0eb2951867 100644
--- a/lib/mountlist.h
+++ b/lib/mountlist.h
@@ -27,15 +27,7 @@ struct mount_entry
   struct mount_entry *me_next;
 };
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-struct mount_entry *read_filesystem_list PARAMS ((int need_fs_type));
+struct mount_entry *read_filesystem_list (int need_fs_type);
 
 #ifndef ME_DUMMY
 # define ME_DUMMY(Fs_name, Fs_type) \
diff --git a/lib/path-concat.h b/lib/path-concat.h
index 8e2c228831..c028f4a087 100644
--- a/lib/path-concat.h
+++ b/lib/path-concat.h
@@ -1,15 +1,6 @@
 #if ! defined PATH_CONCAT_H_
 # define PATH_CONCAT_H_
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-char *
-path_concat PARAMS ((const char *dir, const char *base, char **base_in_result));
+char *path_concat (const char *dir, const char *base, char **base_in_result);
 
 #endif
diff --git a/lib/posixtm.h b/lib/posixtm.h
index 6b64a6eac4..1105478b95 100644
--- a/lib/posixtm.h
+++ b/lib/posixtm.h
@@ -7,15 +7,6 @@
 # define PDS_CENTURY 4
 # define PDS_SECONDS 8
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-bool
-posixtime PARAMS ((time_t *p, const char *s, unsigned int syntax_bits));
+bool posixtime (time_t *p, const char *s, unsigned int syntax_bits);
 
 #endif
diff --git a/lib/quote.h b/lib/quote.h
index c750b1e7b5..058e6b55c8 100644
--- a/lib/quote.h
+++ b/lib/quote.h
@@ -16,13 +16,5 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-char const *quote_n PARAMS ((int n, char const *name));
-char const *quote PARAMS ((char const *name));
+char const *quote_n (int n, char const *name);
+char const *quote (char const *name);
diff --git a/lib/readutmp.h b/lib/readutmp.h
index 3d60b8240a..d17860154d 100644
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -20,14 +20,6 @@
 #ifndef __READUTMP_H__
 # define __READUTMP_H__
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 # include <sys/types.h>
 
 /* AIX 4.3.3 has both utmp.h and utmpx.h, but only struct utmp
@@ -184,15 +176,7 @@ extern int errno;
 #  define WTMP_FILE "/etc/wtmp"
 # endif
 
-# undef PARAMS
-# if defined (__STDC__) && __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-
-extern char *extract_trimmed_name PARAMS ((const STRUCT_UTMP *ut));
-extern int read_utmp PARAMS ((const char *filename,
-			      int *n_entries, STRUCT_UTMP **utmp_buf));
+char *extract_trimmed_name (const STRUCT_UTMP *ut);
+int read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf);
 
 #endif /* __READUTMP_H__ */
diff --git a/lib/savedir.h b/lib/savedir.h
index 03b41f5b05..c99b1a8eef 100644
--- a/lib/savedir.h
+++ b/lib/savedir.h
@@ -1,14 +1,6 @@
 #if !defined SAVEDIR_H_
 # define SAVEDIR_H_
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-char *savedir PARAMS ((const char *dir));
+char *savedir (const char *dir);
 
 #endif
diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 23c8eb66c7..6b0ba7be00 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -31,14 +31,6 @@
 # include <stdlib.h>
 #endif
 
-#ifndef PARAMS
-# if defined PROTOTYPES || defined __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
 /* Verify a requirement at compile-time (unlike assert, which is runtime).  */
 #define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }
 
@@ -47,13 +39,13 @@
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOUL
-unsigned long strtoul PARAMS ((char const *, char **, int));
+unsigned long strtoul (char const *, char **, int);
 # endif
 # ifndef HAVE_DECL_STRTOULL
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG
-unsigned long long strtoull PARAMS ((char const *, char **, int));
+unsigned long long strtoull (char const *, char **, int);
 # endif
 
 #else
@@ -62,13 +54,13 @@ unsigned long long strtoull PARAMS ((char const *, char **, int));
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOL
-long strtol PARAMS ((char const *, char **, int));
+long strtol (char const *, char **, int);
 # endif
 # ifndef HAVE_DECL_STRTOLL
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOLL && HAVE_UNSIGNED_LONG_LONG
-long long strtoll PARAMS ((char const *, char **, int));
+long long strtoll (char const *, char **, int);
 # endif
 #endif
 
diff --git a/lib/unistd-safer.h b/lib/unistd-safer.h
index 1b6a0f7615..b39ffc8210 100644
--- a/lib/unistd-safer.h
+++ b/lib/unistd-safer.h
@@ -1,9 +1 @@
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-int dup_safer PARAMS ((int));
+int dup_safer (int);
diff --git a/lib/version-etc.h b/lib/version-etc.h
index ae223d44e5..de1a76f8fb 100644
--- a/lib/version-etc.h
+++ b/lib/version-etc.h
@@ -20,19 +20,10 @@
 #ifndef VERSION_ETC_H
 # define VERSION_ETC_H 1
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
 extern char *version_etc_copyright;
 
-void
-version_etc PARAMS ((FILE *stream,
-		     const char *command_name, const char *package,
-		     const char *version, const char *authors));
+void version_etc (FILE *stream,
+		  const char *command_name, const char *package,
+		  const char *version, const char *authors);
 
 #endif /* VERSION_ETC_H */
diff --git a/lib/xreadlink.h b/lib/xreadlink.h
index e506a25555..4181a85ccb 100644
--- a/lib/xreadlink.h
+++ b/lib/xreadlink.h
@@ -1,9 +1 @@
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-char *xreadlink PARAMS ((char const *));
+char *xreadlink (char const *);
diff --git a/lib/xstrtod.h b/lib/xstrtod.h
index d286d6f558..7af233b2e4 100644
--- a/lib/xstrtod.h
+++ b/lib/xstrtod.h
@@ -1,15 +1,6 @@
 #ifndef XSTRTOD_H
 # define XSTRTOD_H 1
 
-# ifndef PARAMS
-#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#   define PARAMS(Args) Args
-#  else
-#   define PARAMS(Args) ()
-#  endif
-# endif
-
-int
-  xstrtod PARAMS ((const char *str, const char **ptr, double *result));
+int xstrtod (const char *str, const char **ptr, double *result);
 
 #endif /* not XSTRTOD_H */
-- 
2.47.2