From d1950fa2570d75cdfe788d1c37b8bbeac9f1bd2f Mon Sep 17 00:00:00 2001 From: alfred Date: Tue, 28 May 2002 18:36:43 +0000 Subject: This code defined a private __P, nuke it. --- libexec/bootpd/bootpd.c | 22 ++++++++------------ libexec/bootpd/dovend.c | 4 +--- libexec/bootpd/dumptab.c | 10 +++------ libexec/bootpd/hash.c | 5 +---- libexec/bootpd/hash.h | 33 ++++++++++++++---------------- libexec/bootpd/hwaddr.h | 10 +++------ libexec/bootpd/readfile.c | 52 ++++++++++++++++++++++------------------------- libexec/bootpd/report.h | 10 +++------ 8 files changed, 59 insertions(+), 87 deletions(-) (limited to 'libexec/bootpd') diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c index 0cdb034..fd998e0 100644 --- a/libexec/bootpd/bootpd.c +++ b/libexec/bootpd/bootpd.c @@ -105,22 +105,18 @@ SOFTWARE. * Externals, forward declarations, and global variables */ -#define P(args) args +extern void dumptab(char *); -extern void dumptab P((char *)); - -PRIVATE void catcher P((int)); -PRIVATE int chk_access P((char *, int32 *)); +PRIVATE void catcher(int); +PRIVATE int chk_access(char *, int32 *); #ifdef VEND_CMU -PRIVATE void dovend_cmu P((struct bootp *, struct host *)); +PRIVATE void dovend_cmu(struct bootp *, struct host *); #endif -PRIVATE void dovend_rfc1048 P((struct bootp *, struct host *, int32)); -PRIVATE void handle_reply P((void)); -PRIVATE void handle_request P((void)); -PRIVATE void sendreply P((int forward, int32 dest_override)); -PRIVATE void usage P((void)); - -#undef P +PRIVATE void dovend_rfc1048(struct bootp *, struct host *, int32); +PRIVATE void handle_reply(void); +PRIVATE void handle_request(void); +PRIVATE void sendreply(int forward, int32 dest_override); +PRIVATE void usage(void); /* * IP port numbers for client and server obtained from /etc/services diff --git a/libexec/bootpd/dovend.c b/libexec/bootpd/dovend.c index 6ba36e8..3b2bd97 100644 --- a/libexec/bootpd/dovend.c +++ b/libexec/bootpd/dovend.c @@ -29,9 +29,7 @@ #include "report.h" #include "dovend.h" -#define P(args) args - -PRIVATE int insert_generic P((struct shared_bindata *, byte **, int *)); +PRIVATE int insert_generic(struct shared_bindata *, byte **, int *); /* * Insert the 2nd part of the options into an option buffer. diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c index c88ee19..43e94ec 100644 --- a/libexec/bootpd/dumptab.c +++ b/libexec/bootpd/dumptab.c @@ -28,16 +28,12 @@ #include "patchlevel.h" #include "bootpd.h" -#define P(args) args - #ifdef DEBUG -static void dump_generic P((FILE *, struct shared_bindata *)); -static void dump_host P((FILE *, struct host *)); -static void list_ipaddresses P((FILE *, struct in_addr_list *)); +static void dump_generic(FILE *, struct shared_bindata *); +static void dump_host(FILE *, struct host *); +static void list_ipaddresses(FILE *, struct in_addr_list *); #endif -#undef P - #ifndef DEBUG void dumptab(filename) diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c index 2a0b4e9..146e87e 100644 --- a/libexec/bootpd/hash.c +++ b/libexec/bootpd/hash.c @@ -61,11 +61,8 @@ SOFTWARE. #define PRIVATE static #endif -#define P(args) args +PRIVATE void hashi_FreeMembers(hash_member *, hash_freefp); -PRIVATE void hashi_FreeMembers P((hash_member *, hash_freefp)); - -#undef P diff --git a/libexec/bootpd/hash.h b/libexec/bootpd/hash.h index 8ef1d91..22cdc04 100644 --- a/libexec/bootpd/hash.h +++ b/libexec/bootpd/hash.h @@ -117,35 +117,32 @@ struct hash_tblstruct { }; /* ANSI function prototypes or empty arg list? */ -#define P(args) args -typedef int (*hash_cmpfp) P((hash_datum *, hash_datum *)); -typedef void (*hash_freefp) P((hash_datum *)); +typedef int (*hash_cmpfp)(hash_datum *, hash_datum *); +typedef void (*hash_freefp)(hash_datum *); -extern hash_tbl *hash_Init P((u_int tablesize)); +extern hash_tbl *hash_Init(u_int tablesize); -extern void hash_Reset P((hash_tbl *tbl, hash_freefp)); +extern void hash_Reset(hash_tbl *tbl, hash_freefp); -extern unsigned hash_HashFunction P((u_char *str, u_int len)); +extern unsigned hash_HashFunction(u_char *str, u_int len); -extern int hash_Exists P((hash_tbl *, u_int code, - hash_cmpfp, hash_datum *key)); +extern int hash_Exists(hash_tbl *, u_int code, + hash_cmpfp, hash_datum *key); -extern int hash_Insert P((hash_tbl *, u_int code, +extern int hash_Insert(hash_tbl *, u_int code, hash_cmpfp, hash_datum *key, - hash_datum *element)); + hash_datum *element); -extern int hash_Delete P((hash_tbl *, u_int code, +extern int hash_Delete(hash_tbl *, u_int code, hash_cmpfp, hash_datum *key, - hash_freefp)); + hash_freefp); -extern hash_datum *hash_Lookup P((hash_tbl *, u_int code, - hash_cmpfp, hash_datum *key)); +extern hash_datum *hash_Lookup(hash_tbl *, u_int code, + hash_cmpfp, hash_datum *key); -extern hash_datum *hash_FirstEntry P((hash_tbl *)); +extern hash_datum *hash_FirstEntry(hash_tbl *); -extern hash_datum *hash_NextEntry P((hash_tbl *)); - -#undef P +extern hash_datum *hash_NextEntry(hash_tbl *); #endif /* HASH_H */ diff --git a/libexec/bootpd/hwaddr.h b/libexec/bootpd/hwaddr.h index 38bbdc8..bd68857 100644 --- a/libexec/bootpd/hwaddr.h +++ b/libexec/bootpd/hwaddr.h @@ -22,13 +22,9 @@ struct hwinfo { extern struct hwinfo hwinfolist[]; extern int hwinfocnt; -#define P(args) args - -extern void setarp P((int, struct in_addr *, int, u_char *, int)); -extern char *haddrtoa P((u_char *, int)); -extern void haddr_conv802 P((u_char *, u_char *, int)); - -#undef P +extern void setarp(int, struct in_addr *, int, u_char *, int); +extern char *haddrtoa(u_char *, int); +extern void haddr_conv802(u_char *, u_char *, int); /* * Return the length in bytes of a hardware address of the given type. diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c index 04e552e..7477c3f 100644 --- a/libexec/bootpd/readfile.c +++ b/libexec/bootpd/readfile.c @@ -227,59 +227,55 @@ PRIVATE struct htypename htnamemap[] = { * Externals and forward declarations. */ -#define P(args) args - extern boolean iplookcmp(); -boolean nmcmp P((hash_datum *, hash_datum *)); +boolean nmcmp(hash_datum *, hash_datum *); PRIVATE void - adjust P((char **)); + adjust(char **); PRIVATE void - del_string P((struct shared_string *)); + del_string(struct shared_string *); PRIVATE void - del_bindata P((struct shared_bindata *)); + del_bindata(struct shared_bindata *); PRIVATE void - del_iplist P((struct in_addr_list *)); + del_iplist(struct in_addr_list *); PRIVATE void - eat_whitespace P((char **)); + eat_whitespace(char **); PRIVATE int - eval_symbol P((char **, struct host *)); + eval_symbol(char **, struct host *); PRIVATE void - fill_defaults P((struct host *, char **)); + fill_defaults(struct host *, char **); PRIVATE void - free_host P((hash_datum *)); + free_host(hash_datum *); PRIVATE struct in_addr_list * - get_addresses P((char **)); + get_addresses(char **); PRIVATE struct shared_string * - get_shared_string P((char **)); + get_shared_string(char **); PRIVATE char * - get_string P((char **, char *, u_int *)); + get_string(char **, char *, u_int *); PRIVATE u_int32 - get_u_long P((char **)); + get_u_long(char **); PRIVATE boolean - goodname P((char *)); + goodname(char *); PRIVATE boolean - hwinscmp P((hash_datum *, hash_datum *)); + hwinscmp(hash_datum *, hash_datum *); PRIVATE int - interp_byte P((char **, byte *)); + interp_byte(char **, byte *); PRIVATE void - makelower P((char *)); + makelower(char *); PRIVATE boolean - nullcmp P((hash_datum *, hash_datum *)); + nullcmp(hash_datum *, hash_datum *); PRIVATE int - process_entry P((struct host *, char *)); + process_entry(struct host *, char *); PRIVATE int - process_generic P((char **, struct shared_bindata **, u_int)); + process_generic(char **, struct shared_bindata **, u_int); PRIVATE byte * - prs_haddr P((char **, u_int)); + prs_haddr(char **, u_int); PRIVATE int - prs_inetaddr P((char **, u_int32 *)); + prs_inetaddr(char **, u_int32 *); PRIVATE void - read_entry P((FILE *, char *, u_int *)); + read_entry(FILE *, char *, u_int *); PRIVATE char * - smalloc P((u_int)); - -#undef P + smalloc(u_int); /* diff --git a/libexec/bootpd/report.h b/libexec/bootpd/report.h index dbb1a66..55cec5c 100644 --- a/libexec/bootpd/report.h +++ b/libexec/bootpd/report.h @@ -1,10 +1,6 @@ /* report.h */ /* $FreeBSD$ */ -#define P(args) args - -extern void report_init P((int nolog)); -extern void report P((int, const char *, ...)) __printflike(2, 3); -extern const char *get_errmsg P((void)); - -#undef P +extern void report_init(int nolog); +extern void report(int, const char *, ...) __printflike(2, 3); +extern const char *get_errmsg(void); -- cgit v1.1