[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Findutils-patches] [PATCH] Remove support for compilers lacking prototy
|
From: |
James Youngman |
|
Subject: |
[Findutils-patches] [PATCH] Remove support for compilers lacking prototypes. |
|
Date: |
Sun, 18 Apr 2010 01:21:29 +0100 |
* find/defs.h: Don't define or use the PARAMS macro.
* xargs/xargs.c: Likewise.
* locate/locatedb.h: Likewise.
* locate/frcode.c: Likewise.
* lib/buildcmd.c: Likewise.
* find/tree.c: Likewise.
* find/pred.c: Likewise.
* find/parser.c: Likewise.
* find/fstype.c: Likewise.
* find/find.c: Likewise.
Signed-off-by: James Youngman <address@hidden>
---
ChangeLog | 14 ++++
find/defs.h | 81 ++++++++++----------
find/find.c | 6 +-
find/fstype.c | 2 +-
find/parser.c | 218 ++++++++++++++++++++++++++--------------------------
find/pred.c | 6 +-
find/tree.c | 12 ++--
lib/buildcmd.c | 8 --
locate/frcode.c | 2 +-
locate/locatedb.h | 8 --
xargs/xargs.c | 32 +++-----
11 files changed, 188 insertions(+), 201 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index acf95c1..9f4a038 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-04-18 James Youngman <address@hidden>
+
+ Remove support for compilers lacking prototypes.
+ * find/defs.h: Don't define or use the PARAMS macro.
+ * xargs/xargs.c: Likewise.
+ * locate/locatedb.h: Likewise.
+ * locate/frcode.c: Likewise.
+ * lib/buildcmd.c: Likewise.
+ * find/tree.c: Likewise.
+ * find/pred.c: Likewise.
+ * find/parser.c: Likewise.
+ * find/fstype.c: Likewise.
+ * find/find.c: Likewise.
+
2010-04-17 James Youngman <address@hidden>
Remove obsolete module strpbrk.
diff --git a/find/defs.h b/find/defs.h
index 0e39959..11d1d00 100644
--- a/find/defs.h
+++ b/find/defs.h
@@ -64,9 +64,6 @@ Please stop compiling the program now
#include "quotearg.h"
#include "sharefile.h"
-/* These days we will assume ANSI/ISO C protootypes work on our compiler. */
-#define PARAMS(Args) Args
-
#ifndef ATTRIBUTE_NORETURN
# if HAVE_ATTRIBUTE_NORETURN
# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
@@ -75,13 +72,13 @@ Please stop compiling the program now
# endif
#endif
-int optionl_stat PARAMS((const char *name, struct stat *p));
-int optionp_stat PARAMS((const char *name, struct stat *p));
-int optionh_stat PARAMS((const char *name, struct stat *p));
-int debug_stat PARAMS((const char *file, struct stat *bufp));
+int optionl_stat (const char *name, struct stat *p);
+int optionp_stat (const char *name, struct stat *p);
+int optionh_stat (const char *name, struct stat *p);
+int debug_stat (const char *file, struct stat *bufp);
-void set_stat_placeholders PARAMS((struct stat *p));
-int get_statinfo PARAMS((const char *pathname, const char *name, struct stat
*p));
+void set_stat_placeholders (struct stat *p);
+int get_statinfo (const char *pathname, const char *name, struct stat *p);
#define MODE_WXUSR (S_IWUSR | S_IXUSR)
@@ -356,13 +353,13 @@ enum SymlinkOption
};
extern enum SymlinkOption symlink_handling; /* defined in find.c. */
-void set_follow_state PARAMS((enum SymlinkOption opt));
+void set_follow_state (enum SymlinkOption opt);
void cleanup(void);
/* fstype.c */
-char *filesystem_type PARAMS((const struct stat *statp, const char *path));
+char *filesystem_type (const struct stat *statp, const char *path);
char * get_mounted_filesystems (void);
-dev_t * get_mounted_devices PARAMS((size_t *));
+dev_t * get_mounted_devices (size_t *);
@@ -391,14 +388,14 @@ struct parser_table
};
/* parser.c */
-const struct parser_table* find_parser PARAMS((char *search_name));
-bool parse_print PARAMS((const struct parser_table*, char *argv[], int
*arg_ptr));
-void pred_sanity_check PARAMS((const struct predicate *predicates));
+const struct parser_table* find_parser (char *search_name);
+bool parse_print (const struct parser_table*, char *argv[], int *arg_ptr);
+void pred_sanity_check (const struct predicate *predicates);
void check_option_combinations (const struct predicate *p);
-void parse_begin_user_args PARAMS((char **args, int argno, const struct
predicate *last, const struct predicate *predicates));
-void parse_end_user_args PARAMS((char **args, int argno, const struct
predicate *last, const struct predicate *predicates));
-bool parse_openparen PARAMS((const struct parser_table* entry, char *argv[],
int *arg_ptr));
-bool parse_closeparen PARAMS((const struct parser_table* entry, char *argv[],
int *arg_ptr));
+void parse_begin_user_args (char **args, int argno, const struct predicate
*last, const struct predicate *predicates);
+void parse_end_user_args (char **args, int argno, const struct predicate
*last, const struct predicate *predicates);
+bool parse_openparen (const struct parser_table* entry, char *argv[], int
*arg_ptr);
+bool parse_closeparen (const struct parser_table* entry, char *argv[], int
*arg_ptr);
/* pred.c */
@@ -468,33 +465,33 @@ PREDICATEFUNCTION pred_context;
int launch (struct buildcmd_control *ctl, void *usercontext, int argc, char
**argv);
-char *find_pred_name PARAMS((PRED_FUNC pred_func));
+char *find_pred_name (PRED_FUNC pred_func);
-void print_predicate PARAMS((FILE *fp, const struct predicate *p));
-void print_tree PARAMS((FILE*, struct predicate *node, int indent));
-void print_list PARAMS((FILE*, struct predicate *node));
-void print_optlist PARAMS((FILE *fp, const struct predicate *node));
+void print_predicate (FILE *fp, const struct predicate *p);
+void print_tree (FILE*, struct predicate *node, int indent);
+void print_list (FILE*, struct predicate *node);
+void print_optlist (FILE *fp, const struct predicate *node);
void show_success_rates(const struct predicate *node);
/* tree.c */
bool matches_start_point(const char * glob, bool foldcase);
-struct predicate * build_expression_tree PARAMS((int argc, char *argv[], int
end_of_leading_options));
-struct predicate * get_eval_tree PARAMS((void));
+struct predicate * build_expression_tree (int argc, char *argv[], int
end_of_leading_options);
+struct predicate * get_eval_tree (void);
struct predicate *get_new_pred_noarg (const struct parser_table *entry);
-struct predicate *get_new_pred PARAMS((const struct parser_table *entry));
-struct predicate *get_new_pred_chk_op PARAMS((const struct parser_table *entry,
- const char *arg));
-float calculate_derived_rates PARAMS((struct predicate *p));
+struct predicate *get_new_pred (const struct parser_table *entry);
+struct predicate *get_new_pred_chk_op (const struct parser_table *entry,
+ const char *arg);
+float calculate_derived_rates (struct predicate *p);
/* util.c */
bool fd_leak_check_is_enabled (void);
-struct predicate *insert_primary PARAMS((const struct parser_table *entry,
const char *arg));
-struct predicate *insert_primary_noarg PARAMS((const struct parser_table
*entry));
-struct predicate *insert_primary_withpred PARAMS((const struct parser_table
*entry, PRED_FUNC fptr, const char *arg));
-void usage PARAMS((FILE *fp, int status, char *msg));
+struct predicate *insert_primary (const struct parser_table *entry, const char
*arg);
+struct predicate *insert_primary_noarg (const struct parser_table *entry);
+struct predicate *insert_primary_withpred (const struct parser_table *entry,
PRED_FUNC fptr, const char *arg);
+void usage (FILE *fp, int status, char *msg);
extern bool check_nofollow(void);
void complete_pending_execs(struct predicate *p);
void complete_pending_execdirs (void);
@@ -508,9 +505,9 @@ void nonfatal_target_file_error (int errno_value, const
char *name);
void nonfatal_nontarget_file_error (int errno_value, const char *name);
-int process_leading_options PARAMS((int argc, char *argv[]));
-void set_option_defaults PARAMS((struct options *p));
-void error_severity PARAMS((int level));
+int process_leading_options (int argc, char *argv[]);
+void set_option_defaults (struct options *p);
+void error_severity (int level);
#if 0
#define apply_predicate(pathname, stat_buf_ptr, node) \
@@ -523,11 +520,11 @@ bool apply_predicate(const char *pathname, struct stat
*stat_buf, struct predica
/* find.c. */
-int get_info PARAMS((const char *pathname, struct stat *p, struct predicate
*pred_ptr));
-bool following_links PARAMS((void));
-bool digest_mode PARAMS((mode_t *mode, const char *pathname, const char *name,
struct stat *pstat, bool leaf));
-bool default_prints PARAMS((struct predicate *pred));
-bool looks_like_expression PARAMS((const char *arg, bool leading));
+int get_info (const char *pathname, struct stat *p, struct predicate
*pred_ptr);
+bool following_links (void);
+bool digest_mode (mode_t *mode, const char *pathname, const char *name, struct
stat *pstat, bool leaf);
+bool default_prints (struct predicate *pred);
+bool looks_like_expression (const char *arg, bool leading);
enum DebugOption
diff --git a/find/find.c b/find/find.c
index d0011b2..98d5a37 100644
--- a/find/find.c
+++ b/find/find.c
@@ -77,9 +77,9 @@
static void init_mounted_dev_list (int mandatory);
#endif
-static void process_top_path PARAMS((char *pathname, mode_t mode));
-static int process_path PARAMS((char *pathname, char *name, bool leaf, char
*parent, mode_t type));
-static void process_dir PARAMS((char *pathname, char *name, int pathlen, const
struct stat *statp, char *parent));
+static void process_top_path (char *pathname, mode_t mode);
+static int process_path (char *pathname, char *name, bool leaf, char *parent,
mode_t type);
+static void process_dir (char *pathname, char *name, int pathlen, const struct
stat *statp, char *parent);
diff --git a/find/fstype.c b/find/fstype.c
index c6a6d04..c6dbe8b 100644
--- a/find/fstype.c
+++ b/find/fstype.c
@@ -77,7 +77,7 @@ extern int errno;
# define N_(String) String
#endif
-static char *file_system_type_uncached PARAMS((const struct stat *statp, const
char *path));
+static char *file_system_type_uncached (const struct stat *statp, const char
*path);
/* Get MNTTYPE_IGNORE if it is available. */
diff --git a/find/parser.c b/find/parser.c
index 63fa945..3da5721 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -86,121 +86,121 @@
#define endpwent ()
#endif
-static bool parse_accesscheck PARAMS((const struct parser_table* entry, char
**argv, int *arg_ptr));
-static bool parse_amin PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_and PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_anewer PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_cmin PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_cnewer PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_comma PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_daystart PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_delete PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_d PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_depth PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_empty PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_exec PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_execdir PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_false PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_fls PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_fprintf PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_follow PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_fprint PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_fprint0 PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_fstype PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_gid PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_group PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_help PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_ilname PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_iname PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_inum PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_ipath PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_iregex PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_iwholename PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_links PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_lname PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_ls PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_maxdepth PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_mindepth PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_mmin PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_name PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_negate PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_newer PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_newerXY PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_noleaf PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_nogroup PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_nouser PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_nowarn PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_ok PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_okdir PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_or PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_path PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_perm PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_print0 PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_printf PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_prune PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_regex PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_regextype PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_samefile PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
+static bool parse_accesscheck (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_amin (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_and (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_anewer (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_cmin (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_cnewer (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_comma (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_daystart (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_delete (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_d (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_depth (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_empty (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_exec (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_execdir (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_false (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_fls (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_fprintf (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_follow (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_fprint (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_fprint0 (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_fstype (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_gid (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_group (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_help (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_ilname (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_iname (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_inum (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_ipath (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_iregex (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_iwholename (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_links (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_lname (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_ls (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_maxdepth (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_mindepth (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_mmin (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_name (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_negate (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_newer (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_newerXY (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_noleaf (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_nogroup (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_nouser (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_nowarn (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_ok (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_okdir (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_or (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_path (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_perm (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_print0 (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_printf (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_prune (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_regex (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_regextype (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_samefile (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_size (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_time (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_true (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_type (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_uid (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_used (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_user (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_version (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_wholename (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_xdev (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_ignore_race (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_noignore_race (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_warn (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_xtype (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_quit (const struct parser_table*, char *argv[], int
*arg_ptr);
+static bool parse_context (const struct parser_table*, char *argv[], int
*arg_ptr);
+bool parse_print (const struct parser_table*, char *argv[], int
*arg_ptr);
#if 0
-static bool parse_show_control_chars PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
+static bool parse_show_control_chars (const struct parser_table*, char
*argv[], int *arg_ptr);
#endif
-static bool parse_size PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_time PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_true PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_type PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_uid PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_used PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_user PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_version PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_wholename PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_xdev PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_ignore_race PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_noignore_race PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_warn PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_xtype PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_quit PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-static bool parse_context PARAMS((const struct parser_table*, char
*argv[], int *arg_ptr));
-
-bool parse_print PARAMS((const struct parser_table*, char *argv[],
int *arg_ptr));
-
-
-static bool insert_type PARAMS((char **argv, int *arg_ptr,
- const struct parser_table *entry,
- PRED_FUNC which_pred));
-static bool insert_regex PARAMS((char *argv[], int *arg_ptr,
- const struct parser_table *entry,
- int regex_options));
+
+
+
+static bool insert_type (char **argv, int *arg_ptr,
+ const struct parser_table *entry,
+ PRED_FUNC which_pred);
+static bool insert_regex (char *argv[], int *arg_ptr,
+ const struct parser_table *entry,
+ int regex_options);
static bool insert_fprintf (struct format_val *vec,
- const struct parser_table *entry,
- PRED_FUNC func,
- const char *format);
-
-static struct segment **make_segment PARAMS((struct segment **segment,
- char *format, int len,
- int kind, char format_char,
- char aux_format_char,
- struct predicate *pred));
-static bool insert_exec_ok PARAMS((const char *action,
- const struct parser_table *entry,
- char *argv[],
- int *arg_ptr));
-static bool get_comp_type PARAMS((const char **str,
- enum comparison_type *comp_type));
-static bool get_relative_timestamp PARAMS((const char *str,
- struct time_val *tval,
- struct timespec origin,
- double sec_per_unit,
- const char *overflowmessage));
-static bool get_num PARAMS((const char *str,
- uintmax_t *num,
- enum comparison_type *comp_type));
-static struct predicate* insert_num PARAMS((char *argv[], int *arg_ptr,
- const struct parser_table *entry));
+ const struct parser_table *entry,
+ PRED_FUNC func,
+ const char *format);
+
+static struct segment **make_segment (struct segment **segment,
+ char *format, int len,
+ int kind, char format_char,
+ char aux_format_char,
+ struct predicate *pred);
+static bool insert_exec_ok (const char *action,
+ const struct parser_table *entry,
+ char *argv[],
+ int *arg_ptr);
+static bool get_comp_type (const char **str,
+ enum comparison_type *comp_type);
+static bool get_relative_timestamp (const char *str,
+ struct time_val *tval,
+ struct timespec origin,
+ double sec_per_unit,
+ const char *overflowmessage);
+static bool get_num (const char *str,
+ uintmax_t *num,
+ enum comparison_type *comp_type);
+static struct predicate* insert_num (char *argv[], int *arg_ptr,
+ const struct parser_table *entry);
static void open_output_file (const char *path, struct format_val *p);
static void open_stdout (struct format_val *p);
static bool stream_is_tty(FILE *fp);
-static bool parse_noop PARAMS((const struct parser_table* entry,
- char **argv, int *arg_ptr));
+static bool parse_noop (const struct parser_table* entry,
+ char **argv, int *arg_ptr);
#define PASTE(x,y) x##y
#define STRINGIFY(s) #s
diff --git a/find/pred.c b/find/pred.c
index 3173398..e310eea 100644
--- a/find/pred.c
+++ b/find/pred.c
@@ -165,10 +165,10 @@
#undef MAX
#define MAX(a, b) ((a) > (b) ? (a) : (b))
-static bool match_lname PARAMS((const char *pathname, struct stat *stat_buf,
struct predicate *pred_ptr, bool ignore_case));
+static bool match_lname (const char *pathname, struct stat *stat_buf, struct
predicate *pred_ptr, bool ignore_case);
-static char *format_date PARAMS((struct timespec ts, int kind));
-static char *ctime_format PARAMS((struct timespec ts));
+static char *format_date (struct timespec ts, int kind);
+static char *ctime_format (struct timespec ts);
#ifdef DEBUG
struct pred_assoc
diff --git a/find/tree.c b/find/tree.c
index 769b814..fa108a5 100644
--- a/find/tree.c
+++ b/find/tree.c
@@ -57,12 +57,12 @@ static size_t num_start_points = 0;
-static struct predicate *scan_rest PARAMS((struct predicate **input,
- struct predicate *head,
- short int prev_prec));
-static void merge_pred PARAMS((struct predicate *beg_list, struct predicate
*end_list, struct predicate **last_p));
-static struct predicate *set_new_parent PARAMS((struct predicate *curr, enum
predicate_precedence high_prec, struct predicate **prevp));
-static const char *cost_name PARAMS((enum EvaluationCost cost));
+static struct predicate *scan_rest (struct predicate **input,
+ struct predicate *head,
+ short int prev_prec);
+static void merge_pred (struct predicate *beg_list, struct predicate
*end_list, struct predicate **last_p);
+static struct predicate *set_new_parent (struct predicate *curr, enum
predicate_precedence high_prec, struct predicate **prevp);
+static const char *cost_name (enum EvaluationCost cost);
/* Return true if the indicated path name is a start
diff --git a/lib/buildcmd.c b/lib/buildcmd.c
index e31f76a..81839ad 100644
--- a/lib/buildcmd.c
+++ b/lib/buildcmd.c
@@ -18,14 +18,6 @@
#include <config.h>
-# ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-# endif
-
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
diff --git a/locate/frcode.c b/locate/frcode.c
index 0e144d5..5996266 100644
--- a/locate/frcode.c
+++ b/locate/frcode.c
@@ -104,7 +104,7 @@
#include "findutils-version.h"
#include "progname.h"
-char *xmalloc PARAMS((size_t));
+char *xmalloc (size_t);
/* Write out a 16-bit int, high byte first (network byte order).
* Return true iff all went well.
diff --git a/locate/locatedb.h b/locate/locatedb.h
index d55bc19..a2d6644 100644
--- a/locate/locatedb.h
+++ b/locate/locatedb.h
@@ -52,14 +52,6 @@
/* Offset added to differential counts to encode them as positive numbers. */
#define LOCATEDB_OLD_OFFSET 14
-# ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-# endif
-
typedef enum
{
GetwordEndianStateInitial = 0,
diff --git a/xargs/xargs.c b/xargs/xargs.c
index c311867..c53b5a9 100644
--- a/xargs/xargs.c
+++ b/xargs/xargs.c
@@ -25,14 +25,6 @@
#include <config.h>
-# ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-# endif
-
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
@@ -108,7 +100,7 @@
#include "closein.h"
#include "gnulib-version.h"
-void error PARAMS ((int status, int errnum, char *message,...));
+void error (int status, int errnum, char *message,...);
extern char *version_string;
@@ -218,17 +210,17 @@ enum ClientStatusValues {
-static int read_line PARAMS ((void));
-static int read_string PARAMS ((void));
-static bool print_args PARAMS ((bool ask));
-/* static void do_exec PARAMS ((void)); */
+static int read_line (void);
+static int read_string (void);
+static bool print_args (bool ask);
+/* static void do_exec (void); */
static int xargs_do_exec (struct buildcmd_control *ctl, void *usercontext, int
argc, char **argv);
-static void exec_if_possible PARAMS ((void));
-static void add_proc PARAMS ((pid_t pid));
-static void wait_for_proc PARAMS ((bool all, unsigned int minreap));
-static void wait_for_proc_all PARAMS ((void));
-static long parse_num PARAMS ((char *str, int option, long min, long max, int
fatal));
-static void usage PARAMS ((FILE * stream));
+static void exec_if_possible (void);
+static void add_proc (pid_t pid);
+static void wait_for_proc (bool all, unsigned int minreap);
+static void wait_for_proc_all (void);
+static long parse_num (char *str, int option, long min, long max, int fatal);
+static void usage (FILE * stream);
@@ -375,7 +367,7 @@ main (int argc, char **argv)
int always_run_command = 1;
char *input_file = "-"; /* "-" is stdin */
char *default_cmd = "/bin/echo";
- int (*read_args) PARAMS ((void)) = read_line;
+ int (*read_args) (void) = read_line;
void (*act_on_init_result)(void) = noop;
enum BC_INIT_STATUS bcstatus;
enum { XARGS_POSIX_HEADROOM = 2048u };
--
1.7.0
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Findutils-patches] [PATCH] Remove support for compilers lacking prototypes.,
James Youngman <=