From 060e5496fc388fc6c9f2f377050f69f8e8cd15b0 Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Sun, 20 Sep 2015 20:50:56 +0000 Subject: [PATCH] Use ANSI C prototypes. Eliminates -Wold-style-definition warnings. --- lib/libc/inet/inet_lnaof.c | 3 +-- lib/libc/inet/inet_makeaddr.c | 3 +-- lib/libc/inet/inet_net_ntop.c | 13 ++----------- lib/libc/inet/inet_neta.c | 5 +---- lib/libc/inet/inet_netof.c | 3 +-- lib/libc/inet/inet_network.c | 3 +-- 6 files changed, 7 insertions(+), 23 deletions(-) diff --git a/lib/libc/inet/inet_lnaof.c b/lib/libc/inet/inet_lnaof.c index 7cab8946bba..274253f4a31 100644 --- a/lib/libc/inet/inet_lnaof.c +++ b/lib/libc/inet/inet_lnaof.c @@ -47,8 +47,7 @@ __FBSDID("$FreeBSD$"); * number formats. */ in_addr_t -inet_lnaof(in) - struct in_addr in; +inet_lnaof(struct in_addr in) { in_addr_t i = ntohl(in.s_addr); diff --git a/lib/libc/inet/inet_makeaddr.c b/lib/libc/inet/inet_makeaddr.c index 04a37a03479..bce0aa1c127 100644 --- a/lib/libc/inet/inet_makeaddr.c +++ b/lib/libc/inet/inet_makeaddr.c @@ -46,8 +46,7 @@ __FBSDID("$FreeBSD$"); * building addresses stored in the ifnet structure. */ struct in_addr -inet_makeaddr(net, host) - in_addr_t net, host; +inet_makeaddr(in_addr_t net, in_addr_t host) { struct in_addr a; diff --git a/lib/libc/inet/inet_net_ntop.c b/lib/libc/inet/inet_net_ntop.c index da7af33e2a2..001a30408c5 100644 --- a/lib/libc/inet/inet_net_ntop.c +++ b/lib/libc/inet/inet_net_ntop.c @@ -57,12 +57,7 @@ static char * inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, * Paul Vixie (ISC), July 1996 */ char * -inet_net_ntop(af, src, bits, dst, size) - int af; - const void *src; - int bits; - char *dst; - size_t size; +inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size) { switch (af) { case AF_INET: @@ -89,11 +84,7 @@ inet_net_ntop(af, src, bits, dst, size) * Paul Vixie (ISC), July 1996 */ static char * -inet_net_ntop_ipv4(src, bits, dst, size) - const u_char *src; - int bits; - char *dst; - size_t size; +inet_net_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) { char *odst = dst; char *t; diff --git a/lib/libc/inet/inet_neta.c b/lib/libc/inet/inet_neta.c index 01ad3be44a4..06a1bdbe136 100644 --- a/lib/libc/inet/inet_neta.c +++ b/lib/libc/inet/inet_neta.c @@ -52,10 +52,7 @@ __FBSDID("$FreeBSD$"); * Paul Vixie (ISC), July 1996 */ char * -inet_neta(src, dst, size) - in_addr_t src; - char *dst; - size_t size; +inet_neta(in_addr_t src, char *dst, size_t size) { char *odst = dst; char *tp; diff --git a/lib/libc/inet/inet_netof.c b/lib/libc/inet/inet_netof.c index 8931c30fb03..2335772b68d 100644 --- a/lib/libc/inet/inet_netof.c +++ b/lib/libc/inet/inet_netof.c @@ -46,8 +46,7 @@ __FBSDID("$FreeBSD$"); * address; handles class a/b/c network #'s. */ in_addr_t -inet_netof(in) - struct in_addr in; +inet_netof(struct in_addr in) { in_addr_t i = ntohl(in.s_addr); diff --git a/lib/libc/inet/inet_network.c b/lib/libc/inet/inet_network.c index 254db41acb2..b5b9190ac18 100644 --- a/lib/libc/inet/inet_network.c +++ b/lib/libc/inet/inet_network.c @@ -48,8 +48,7 @@ __FBSDID("$FreeBSD$"); * network numbers. */ in_addr_t -inet_network(cp) - const char *cp; +inet_network(const char *cp) { in_addr_t val, base, n; char c;