ANSIfy, since I'm in the area.
This commit is contained in:
parent
2320944ad7
commit
e3f0868ef4
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: inet_lnaof.c,v 1.8 2003/05/05 13:56:14 bjh21 Exp $ */
|
/* $NetBSD: inet_lnaof.c,v 1.9 2003/05/05 21:35:40 bjh21 Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1983, 1993
|
* Copyright (c) 1983, 1993
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
#if 0
|
#if 0
|
||||||
static char sccsid[] = "@(#)inet_lnaof.c 8.1 (Berkeley) 6/4/93";
|
static char sccsid[] = "@(#)inet_lnaof.c 8.1 (Berkeley) 6/4/93";
|
||||||
#else
|
#else
|
||||||
__RCSID("$NetBSD: inet_lnaof.c,v 1.8 2003/05/05 13:56:14 bjh21 Exp $");
|
__RCSID("$NetBSD: inet_lnaof.c,v 1.9 2003/05/05 21:35:40 bjh21 Exp $");
|
||||||
#endif
|
#endif
|
||||||
#endif /* LIBC_SCCS and not lint */
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
@ -57,10 +57,9 @@ __weak_alias(inet_lnaof,_inet_lnaof)
|
||||||
* number formats.
|
* number formats.
|
||||||
*/
|
*/
|
||||||
in_addr_t
|
in_addr_t
|
||||||
inet_lnaof(in)
|
inet_lnaof(struct in_addr in)
|
||||||
struct in_addr in;
|
|
||||||
{
|
{
|
||||||
register u_long i = ntohl(in.s_addr);
|
in_addr_t i = ntohl(in.s_addr);
|
||||||
|
|
||||||
if (IN_CLASSA(i))
|
if (IN_CLASSA(i))
|
||||||
return ((i)&IN_CLASSA_HOST);
|
return ((i)&IN_CLASSA_HOST);
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: inet_makeaddr.c,v 1.13 2003/05/05 20:12:23 bjh21 Exp $ */
|
/* $NetBSD: inet_makeaddr.c,v 1.14 2003/05/05 21:35:41 bjh21 Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1983, 1993
|
* Copyright (c) 1983, 1993
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
#if 0
|
#if 0
|
||||||
static char sccsid[] = "@(#)inet_makeaddr.c 8.1 (Berkeley) 6/4/93";
|
static char sccsid[] = "@(#)inet_makeaddr.c 8.1 (Berkeley) 6/4/93";
|
||||||
#else
|
#else
|
||||||
__RCSID("$NetBSD: inet_makeaddr.c,v 1.13 2003/05/05 20:12:23 bjh21 Exp $");
|
__RCSID("$NetBSD: inet_makeaddr.c,v 1.14 2003/05/05 21:35:41 bjh21 Exp $");
|
||||||
#endif
|
#endif
|
||||||
#endif /* LIBC_SCCS and not lint */
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
@ -56,8 +56,7 @@ __weak_alias(inet_makeaddr,_inet_makeaddr)
|
||||||
* building addresses stored in the ifnet structure.
|
* building addresses stored in the ifnet structure.
|
||||||
*/
|
*/
|
||||||
struct in_addr
|
struct in_addr
|
||||||
inet_makeaddr(net, host)
|
inet_makeaddr(in_addr_t net, in_addr_t host)
|
||||||
in_addr_t net, host;
|
|
||||||
{
|
{
|
||||||
in_addr_t addr;
|
in_addr_t addr;
|
||||||
struct in_addr ret;
|
struct in_addr ret;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: inet_netof.c,v 1.9 2003/05/05 19:53:29 bjh21 Exp $ */
|
/* $NetBSD: inet_netof.c,v 1.10 2003/05/05 21:35:42 bjh21 Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1983, 1993
|
* Copyright (c) 1983, 1993
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
#if 0
|
#if 0
|
||||||
static char sccsid[] = "@(#)inet_netof.c 8.1 (Berkeley) 6/4/93";
|
static char sccsid[] = "@(#)inet_netof.c 8.1 (Berkeley) 6/4/93";
|
||||||
#else
|
#else
|
||||||
__RCSID("$NetBSD: inet_netof.c,v 1.9 2003/05/05 19:53:29 bjh21 Exp $");
|
__RCSID("$NetBSD: inet_netof.c,v 1.10 2003/05/05 21:35:42 bjh21 Exp $");
|
||||||
#endif
|
#endif
|
||||||
#endif /* LIBC_SCCS and not lint */
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
@ -56,8 +56,7 @@ __weak_alias(inet_netof,_inet_netof)
|
||||||
* address; handles class a/b/c network #'s.
|
* address; handles class a/b/c network #'s.
|
||||||
*/
|
*/
|
||||||
in_addr_t
|
in_addr_t
|
||||||
inet_netof(in)
|
inet_netof(struct in_addr in)
|
||||||
struct in_addr in;
|
|
||||||
{
|
{
|
||||||
in_addr_t i = ntohl(in.s_addr);
|
in_addr_t i = ntohl(in.s_addr);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: inet_network.c,v 1.16 2003/05/05 19:54:59 bjh21 Exp $ */
|
/* $NetBSD: inet_network.c,v 1.17 2003/05/05 21:35:42 bjh21 Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1983, 1993
|
* Copyright (c) 1983, 1993
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
#if 0
|
#if 0
|
||||||
static char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93";
|
static char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93";
|
||||||
#else
|
#else
|
||||||
__RCSID("$NetBSD: inet_network.c,v 1.16 2003/05/05 19:54:59 bjh21 Exp $");
|
__RCSID("$NetBSD: inet_network.c,v 1.17 2003/05/05 21:35:42 bjh21 Exp $");
|
||||||
#endif
|
#endif
|
||||||
#endif /* LIBC_SCCS and not lint */
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
@ -60,8 +60,7 @@ __weak_alias(inet_network,_inet_network)
|
||||||
* network numbers.
|
* network numbers.
|
||||||
*/
|
*/
|
||||||
in_addr_t
|
in_addr_t
|
||||||
inet_network(cp)
|
inet_network(const char *cp)
|
||||||
register const char *cp;
|
|
||||||
{
|
{
|
||||||
in_addr_t val;
|
in_addr_t val;
|
||||||
size_t i, n;
|
size_t i, n;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: inet_pton.c,v 1.18 2003/05/05 13:56:14 bjh21 Exp $ */
|
/* $NetBSD: inet_pton.c,v 1.19 2003/05/05 21:35:42 bjh21 Exp $ */
|
||||||
|
|
||||||
/* Copyright (c) 1996 by Internet Software Consortium.
|
/* Copyright (c) 1996 by Internet Software Consortium.
|
||||||
*
|
*
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
#if 0
|
#if 0
|
||||||
static char rcsid[] = "Id: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp ";
|
static char rcsid[] = "Id: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp ";
|
||||||
#else
|
#else
|
||||||
__RCSID("$NetBSD: inet_pton.c,v 1.18 2003/05/05 13:56:14 bjh21 Exp $");
|
__RCSID("$NetBSD: inet_pton.c,v 1.19 2003/05/05 21:35:42 bjh21 Exp $");
|
||||||
#endif
|
#endif
|
||||||
#endif /* LIBC_SCCS and not lint */
|
#endif /* LIBC_SCCS and not lint */
|
||||||
|
|
||||||
|
@ -49,8 +49,8 @@ __weak_alias(inet_pton,_inet_pton)
|
||||||
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
|
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static int inet_pton4 __P((const char *src, u_char *dst, int pton));
|
static int inet_pton4(const char *src, u_char *dst, int pton);
|
||||||
static int inet_pton6 __P((const char *src, u_char *dst));
|
static int inet_pton6(const char *src, u_char *dst);
|
||||||
|
|
||||||
/* int
|
/* int
|
||||||
* inet_pton(af, src, dst)
|
* inet_pton(af, src, dst)
|
||||||
|
@ -64,10 +64,7 @@ static int inet_pton6 __P((const char *src, u_char *dst));
|
||||||
* Paul Vixie, 1996.
|
* Paul Vixie, 1996.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
inet_pton(af, src, dst)
|
inet_pton(int af, const char *src, void *dst)
|
||||||
int af;
|
|
||||||
const char *src;
|
|
||||||
void *dst;
|
|
||||||
{
|
{
|
||||||
|
|
||||||
_DIAGASSERT(src != NULL);
|
_DIAGASSERT(src != NULL);
|
||||||
|
@ -97,10 +94,7 @@ inet_pton(af, src, dst)
|
||||||
* Paul Vixie, 1996.
|
* Paul Vixie, 1996.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
inet_pton4(src, dst, pton)
|
inet_pton4(const char *src, u_char *dst, int pton)
|
||||||
const char *src;
|
|
||||||
u_char *dst;
|
|
||||||
int pton;
|
|
||||||
{
|
{
|
||||||
u_int32_t val;
|
u_int32_t val;
|
||||||
u_int digit, base;
|
u_int digit, base;
|
||||||
|
@ -223,9 +217,7 @@ inet_pton4(src, dst, pton)
|
||||||
* Paul Vixie, 1996.
|
* Paul Vixie, 1996.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
inet_pton6(src, dst)
|
inet_pton6(const char *src, u_char *dst)
|
||||||
const char *src;
|
|
||||||
u_char *dst;
|
|
||||||
{
|
{
|
||||||
static const char xdigits_l[] = "0123456789abcdef",
|
static const char xdigits_l[] = "0123456789abcdef",
|
||||||
xdigits_u[] = "0123456789ABCDEF";
|
xdigits_u[] = "0123456789ABCDEF";
|
||||||
|
@ -318,8 +310,7 @@ inet_pton6(src, dst)
|
||||||
* The value returned is in network order.
|
* The value returned is in network order.
|
||||||
*/
|
*/
|
||||||
in_addr_t
|
in_addr_t
|
||||||
inet_addr(cp)
|
inet_addr(const char *cp)
|
||||||
register const char *cp;
|
|
||||||
{
|
{
|
||||||
struct in_addr val;
|
struct in_addr val;
|
||||||
|
|
||||||
|
@ -338,9 +329,7 @@ inet_addr(cp)
|
||||||
* cannot distinguish between failure and a local broadcast address.
|
* cannot distinguish between failure and a local broadcast address.
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
inet_aton(cp, addr)
|
inet_aton(const char *cp, struct in_addr *addr)
|
||||||
register const char *cp;
|
|
||||||
struct in_addr *addr;
|
|
||||||
{
|
{
|
||||||
|
|
||||||
_DIAGASSERT(cp != NULL);
|
_DIAGASSERT(cp != NULL);
|
||||||
|
|
Loading…
Reference in New Issue