From 3ea68c883358da62f5ac06001a4f28d3d80760b8 Mon Sep 17 00:00:00 2001 From: ngie Date: Sat, 30 Sep 2017 20:50:31 +0000 Subject: [PATCH] MFC r322635: Fix WARNS - Remove ad hoc inet_ntoa prototype declaration; it's already handled by the included headers. - De-K&Rify the function prototypes for eachres_whoami(..), eachres_getfile(..), and main(..). PR: 71667 Tested with: clang (5.0), gcc (4.2.1, 5) git-svn-id: svn://svn.freebsd.org/base/stable/10@324142 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/bootparamd/callbootd/callbootd.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c index a0a4ef62f..02f906452 100644 --- a/usr.sbin/bootparamd/callbootd/callbootd.c +++ b/usr.sbin/bootparamd/callbootd/callbootd.c @@ -32,15 +32,12 @@ int broadcast; char cln[MAX_MACHINE_NAME+1]; char dmn[MAX_MACHINE_NAME+1]; char path[MAX_PATH_LEN+1]; -extern char *inet_ntoa(); static void usage(void); int printgetfile(bp_getfile_res *); int printwhoami(bp_whoami_res *); -bool_t -eachres_whoami(resultp, raddr) -bp_whoami_res *resultp; -struct sockaddr_in *raddr; +static bool_t +eachres_whoami(bp_whoami_res *resultp, struct sockaddr_in *raddr) { struct hostent *he; @@ -51,10 +48,8 @@ struct sockaddr_in *raddr; return(0); } -bool_t -eachres_getfile(resultp, raddr) -bp_getfile_res *resultp; -struct sockaddr_in *raddr; +static bool_t +eachres_getfile(bp_getfile_res *resultp, struct sockaddr_in *raddr) { struct hostent *he; @@ -67,9 +62,7 @@ struct sockaddr_in *raddr; int -main(argc, argv) -int argc; -char **argv; +main(int argc, char **argv) { char *server; -- 2.45.0