Module Name: src
Committed By: matt
Date: Tue Mar 20 17:44:18 UTC 2012
Modified Files:
src/lib/libc/isc: ev_timers.c
src/lib/libc/locale: current_locale.c
src/lib/libc/net: ethers.c getnameinfo.c getnetent.c hesiod.c ip6opt.c
iso_addr.c linkaddr.c nslexer.l nsparser.y recv.c send.c
sethostent.c sockatmark.c
src/lib/libc/nls: catopen.c
src/lib/libc/resolv: res_init.c res_send.c
src/lib/libc/string: __strsignal.c
Log Message:
Use C89 Prototypes.
Remove use of __P
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/isc/ev_timers.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/current_locale.c
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/net/ethers.c
cvs rdiff -u -r1.51 -r1.52 src/lib/libc/net/getnameinfo.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/net/getnetent.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/net/hesiod.c
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/net/ip6opt.c \
src/lib/libc/net/iso_addr.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/net/linkaddr.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/net/nslexer.l \
src/lib/libc/net/nsparser.y
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/net/recv.c src/lib/libc/net/send.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/net/sethostent.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/net/sockatmark.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/nls/catopen.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/resolv/res_init.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/resolv/res_send.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/string/__strsignal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/isc/ev_timers.c
diff -u src/lib/libc/isc/ev_timers.c:1.9 src/lib/libc/isc/ev_timers.c:1.10
--- src/lib/libc/isc/ev_timers.c:1.9 Tue Mar 13 21:13:38 2012
+++ src/lib/libc/isc/ev_timers.c Tue Mar 20 17:44:17 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ev_timers.c,v 1.9 2012/03/13 21:13:38 christos Exp $ */
+/* $NetBSD: ev_timers.c,v 1.10 2012/03/20 17:44:17 matt Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@@ -26,7 +26,7 @@
#ifdef notdef
static const char rcsid[] = "Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp";
#else
-__RCSID("$NetBSD: ev_timers.c,v 1.9 2012/03/13 21:13:38 christos Exp $");
+__RCSID("$NetBSD: ev_timers.c,v 1.10 2012/03/20 17:44:17 matt Exp $");
#endif
#endif
@@ -120,7 +120,8 @@ evCmpTime(struct timespec a, struct time
}
struct timespec
-evNowTime() {
+evNowTime(void)
+{
struct timeval now;
#ifdef CLOCK_REALTIME
struct timespec tsnow;
Index: src/lib/libc/locale/current_locale.c
diff -u src/lib/libc/locale/current_locale.c:1.2 src/lib/libc/locale/current_locale.c:1.3
--- src/lib/libc/locale/current_locale.c:1.2 Sun Jan 11 02:46:28 2009
+++ src/lib/libc/locale/current_locale.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: current_locale.c,v 1.2 2009/01/11 02:46:28 christos Exp $ */
+/* $NetBSD: current_locale.c,v 1.3 2012/03/20 17:44:18 matt Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: current_locale.c,v 1.2 2009/01/11 02:46:28 christos Exp $");
+__RCSID("$NetBSD: current_locale.c,v 1.3 2012/03/20 17:44:18 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
@@ -43,7 +43,7 @@ __RCSID("$NetBSD: current_locale.c,v 1.2
static struct _locale_impl_t *__current_locale = &_global_locale;
struct _locale_impl_t **
-_current_locale()
+_current_locale(void)
{
return &__current_locale;
}
Index: src/lib/libc/net/ethers.c
diff -u src/lib/libc/net/ethers.c:1.22 src/lib/libc/net/ethers.c:1.23
--- src/lib/libc/net/ethers.c:1.22 Tue Mar 13 21:13:40 2012
+++ src/lib/libc/net/ethers.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ethers.c,v 1.22 2012/03/13 21:13:40 christos Exp $ */
+/* $NetBSD: ethers.c,v 1.23 2012/03/20 17:44:18 matt Exp $ */
/*
* ethers(3N) a la Sun.
@@ -9,7 +9,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ethers.c,v 1.22 2012/03/13 21:13:40 christos Exp $");
+__RCSID("$NetBSD: ethers.c,v 1.23 2012/03/20 17:44:18 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -44,8 +44,7 @@ __weak_alias(ether_ntohost,_ether_ntohos
#endif
char *
-ether_ntoa(e)
- const struct ether_addr *e;
+ether_ntoa(const struct ether_addr *e)
{
static char a[18];
@@ -59,8 +58,7 @@ ether_ntoa(e)
}
struct ether_addr *
-ether_aton(s)
- const char *s;
+ether_aton(const char *s)
{
static struct ether_addr n;
u_int i[6];
@@ -81,9 +79,7 @@ ether_aton(s)
}
int
-ether_ntohost(hostname, e)
- char *hostname;
- const struct ether_addr *e;
+ether_ntohost(char *hostname, const struct ether_addr *e)
{
FILE *f;
char *p;
@@ -143,9 +139,7 @@ ether_ntohost(hostname, e)
}
int
-ether_hostton(hostname, e)
- const char *hostname;
- struct ether_addr *e;
+ether_hostton(const char *hostname, struct ether_addr *e)
{
FILE *f;
char *p;
@@ -197,10 +191,7 @@ ether_hostton(hostname, e)
}
int
-ether_line(l, e, hostname)
- const char *l;
- struct ether_addr *e;
- char *hostname;
+ether_line(const char *l, struct ether_addr *e, char *hostname)
{
u_int i[6];
Index: src/lib/libc/net/getnameinfo.c
diff -u src/lib/libc/net/getnameinfo.c:1.51 src/lib/libc/net/getnameinfo.c:1.52
--- src/lib/libc/net/getnameinfo.c:1.51 Tue Mar 13 21:13:41 2012
+++ src/lib/libc/net/getnameinfo.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getnameinfo.c,v 1.51 2012/03/13 21:13:41 christos Exp $ */
+/* $NetBSD: getnameinfo.c,v 1.52 2012/03/20 17:44:18 matt Exp $ */
/* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */
/*
@@ -47,7 +47,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnameinfo.c,v 1.51 2012/03/13 21:13:41 christos Exp $");
+__RCSID("$NetBSD: getnameinfo.c,v 1.52 2012/03/20 17:44:18 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -95,32 +95,29 @@ struct sockinet {
u_short si_port;
};
-static int getnameinfo_inet __P((const struct sockaddr *, socklen_t, char *,
- socklen_t, char *, socklen_t, int));
+static int getnameinfo_inet(const struct sockaddr *, socklen_t, char *,
+ socklen_t, char *, socklen_t, int);
#ifdef INET6
-static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
- socklen_t, int));
-static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t,
- int));
+static int ip6_parsenumeric(const struct sockaddr *, const char *, char *,
+ socklen_t, int);
+static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
#endif
-static int getnameinfo_atalk __P((const struct sockaddr *, socklen_t, char *,
- socklen_t, char *, socklen_t, int));
+static int getnameinfo_atalk(const struct sockaddr *, socklen_t, char *,
+ socklen_t, char *, socklen_t, int);
-static int getnameinfo_link __P((const struct sockaddr *, socklen_t, char *,
- socklen_t, char *, socklen_t, int));
-static int hexname __P((const u_int8_t *, size_t, char *, socklen_t));
+static int getnameinfo_link(const struct sockaddr *, socklen_t, char *,
+ socklen_t, char *, socklen_t, int);
+static int hexname(const uint8_t *, size_t, char *, socklen_t);
/*
* Top-level getnameinfo() code. Look at the address family, and pick an
* appropriate function to call.
*/
int
-getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
- const struct sockaddr *sa;
- socklen_t salen;
- char *host, *serv;
- socklen_t hostlen, servlen;
- int flags;
+getnameinfo(const struct sockaddr *sa, socklen_t salen,
+ char *host, socklen_t hostlen,
+ char *serv, socklen_t servlen,
+ int flags)
{
switch (sa->sa_family) {
@@ -204,14 +201,10 @@ errout:
* Format an IPv4 or IPv6 sockaddr into a printable string.
*/
static int
-getnameinfo_inet(sa, salen, host, hostlen, serv, servlen, flags)
- const struct sockaddr *sa;
- socklen_t salen;
- char *host;
- socklen_t hostlen;
- char *serv;
- socklen_t servlen;
- int flags;
+getnameinfo_inet(const struct sockaddr *sa, socklen_t salen,
+ char *host, socklen_t hostlen,
+ char *serv, socklen_t servlen,
+ int flags)
{
const struct afd *afd;
struct servent *sp;
@@ -219,7 +212,7 @@ getnameinfo_inet(sa, salen, host, hostle
u_short port;
int family, i;
const char *addr;
- u_int32_t v4a;
+ uint32_t v4a;
char numserv[512];
char numaddr[512];
@@ -281,7 +274,7 @@ getnameinfo_inet(sa, salen, host, hostle
switch (sa->sa_family) {
case AF_INET:
- v4a = (u_int32_t)
+ v4a = (uint32_t)
ntohl(((const struct sockaddr_in *)
(const void *)sa)->sin_addr.s_addr);
if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
@@ -401,12 +394,8 @@ getnameinfo_inet(sa, salen, host, hostle
#ifdef INET6
static int
-ip6_parsenumeric(sa, addr, host, hostlen, flags)
- const struct sockaddr *sa;
- const char *addr;
- char *host;
- socklen_t hostlen;
- int flags;
+ip6_parsenumeric(const struct sockaddr *sa, const char *addr, char *host,
+ socklen_t hostlen, int flags)
{
size_t numaddrlen;
char numaddr[512];
@@ -447,11 +436,7 @@ ip6_parsenumeric(sa, addr, host, hostlen
/* ARGSUSED */
static int
-ip6_sa2str(sa6, buf, bufsiz, flags)
- const struct sockaddr_in6 *sa6;
- char *buf;
- size_t bufsiz;
- int flags;
+ip6_sa2str(const struct sockaddr_in6 *sa6, char *buf, size_t bufsiz, int flags)
{
unsigned int ifindex;
const struct in6_addr *a6;
@@ -565,17 +550,13 @@ getnameinfo_link(const struct sockaddr *
case IFT_HIPPI:
case IFT_ISO88025:
default:
- return hexname((const u_int8_t *)CLLADDR(sdl),
+ return hexname((const uint8_t *)CLLADDR(sdl),
(size_t)sdl->sdl_alen, host, hostlen);
}
}
static int
-hexname(cp, len, host, hostlen)
- const u_int8_t *cp;
- char *host;
- size_t len;
- socklen_t hostlen;
+hexname(const uint8_t *cp, size_t len, char *host, socklen_t hostlen)
{
int n;
size_t i;
Index: src/lib/libc/net/getnetent.c
diff -u src/lib/libc/net/getnetent.c:1.20 src/lib/libc/net/getnetent.c:1.21
--- src/lib/libc/net/getnetent.c:1.20 Tue Mar 13 21:13:41 2012
+++ src/lib/libc/net/getnetent.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getnetent.c,v 1.20 2012/03/13 21:13:41 christos Exp $ */
+/* $NetBSD: getnetent.c,v 1.21 2012/03/20 17:44:18 matt Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -44,7 +44,7 @@
static char sccsid[] = "@(#)getnetent.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: getnetent.c,v 1.20 2012/03/13 21:13:41 christos Exp $");
+__RCSID("$NetBSD: getnetent.c,v 1.21 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,12 +71,11 @@ static struct netent net;
static char *net_aliases[MAXALIASES];
int _net_stayopen;
-static void __setnetent __P((int));
-static void __endnetent __P((void));
+static void __setnetent(int);
+static void __endnetent(void);
void
-setnetent(stayopen)
- int stayopen;
+setnetent(int stayopen)
{
sethostent(stayopen);
@@ -84,7 +83,7 @@ setnetent(stayopen)
}
void
-endnetent()
+endnetent(void)
{
endhostent();
@@ -92,8 +91,7 @@ endnetent()
}
static void
-__setnetent(f)
- int f;
+__setnetent(int f)
{
if (netf == NULL)
@@ -104,7 +102,7 @@ __setnetent(f)
}
static void
-__endnetent()
+__endnetent(void)
{
if (netf) {
@@ -115,7 +113,7 @@ __endnetent()
}
struct netent *
-getnetent()
+getnetent(void)
{
char *p;
register char *cp, **q;
Index: src/lib/libc/net/hesiod.c
diff -u src/lib/libc/net/hesiod.c:1.26 src/lib/libc/net/hesiod.c:1.27
--- src/lib/libc/net/hesiod.c:1.26 Sat Oct 15 22:57:57 2011
+++ src/lib/libc/net/hesiod.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hesiod.c,v 1.26 2011/10/15 22:57:57 christos Exp $ */
+/* $NetBSD: hesiod.c,v 1.27 2012/03/20 17:44:18 matt Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium.
*
@@ -51,7 +51,7 @@ __IDSTRING(rcsid_hesiod_p_h,
"#Id: hesiod_p.h,v 1.1 1996/12/08 21:39:37 ghudson Exp #");
__IDSTRING(rcsid_hescompat_c,
"#Id: hescompat.c,v 1.1.2.1 1996/12/16 08:37:45 ghudson Exp #");
-__RCSID("$NetBSD: hesiod.c,v 1.26 2011/10/15 22:57:57 christos Exp $");
+__RCSID("$NetBSD: hesiod.c,v 1.27 2012/03/20 17:44:18 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -92,10 +92,10 @@ struct hesiod_p {
#define MAX_HESRESP 1024
-static int read_config_file __P((struct hesiod_p *, const char *));
-static char **get_txt_records __P((int, const char *));
-static int init_context __P((void));
-static void translate_errors __P((void));
+static int read_config_file(struct hesiod_p *, const char *);
+static char **get_txt_records(int, const char *);
+static int init_context(void);
+static void translate_errors(void);
/*
@@ -103,8 +103,7 @@ static void translate_errors __P((void
* initialize a hesiod_p.
*/
int
-hesiod_init(context)
- void **context;
+hesiod_init(void **context)
{
struct hesiod_p *ctx;
const char *p, *configname;
@@ -168,8 +167,7 @@ hesiod_init(context)
* Deallocates the hesiod_p.
*/
void
-hesiod_end(context)
- void *context;
+hesiod_end(void *context)
{
struct hesiod_p *ctx = (struct hesiod_p *) context;
@@ -265,10 +263,7 @@ hesiod_to_bind(void *context, const char
* by the resolver.
*/
char **
-hesiod_resolve(context, name, type)
- void *context;
- const char *name;
- const char *type;
+hesiod_resolve(void *context, const char *name, const char *type)
{
struct hesiod_p *ctx = (struct hesiod_p *) context;
char *bindname, **retvec;
@@ -291,9 +286,7 @@ hesiod_resolve(context, name, type)
/*ARGSUSED*/
void
-hesiod_free_list(context, list)
- void *context;
- char **list;
+hesiod_free_list(void *context, char **list)
{
char **p;
@@ -313,9 +306,7 @@ hesiod_free_list(context, list)
* or ctx->rhs which need to be freed by the caller.
*/
static int
-read_config_file(ctx, filename)
- struct hesiod_p *ctx;
- const char *filename;
+read_config_file(struct hesiod_p *ctx, const char *filename)
{
char *buf, *key, *data, *p, **which;
int n;
@@ -418,9 +409,7 @@ read_config_file(ctx, filename)
* return a list of them.
*/
static char **
-get_txt_records(qclass, name)
- int qclass;
- const char *name;
+get_txt_records(int qclass, const char *name)
{
HEADER *hp;
unsigned char qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor;
@@ -550,16 +539,14 @@ static void *context;
static int errval = HES_ER_UNINIT;
int
-hes_init()
+hes_init(void)
{
init_context();
return errval;
}
char *
-hes_to_bind(name, type)
- const char *name;
- const char *type;
+hes_to_bind(const char *name, const char *type)
{
static char *bindname;
@@ -577,9 +564,7 @@ hes_to_bind(name, type)
}
char **
-hes_resolve(name, type)
- const char *name;
- const char *type;
+hes_resolve(const char *name, const char *type)
{
static char **list;
@@ -603,20 +588,19 @@ hes_resolve(name, type)
}
int
-hes_error()
+hes_error(void)
{
return errval;
}
void
-hes_free(hp)
- char **hp;
+hes_free(char **hp)
{
hesiod_free_list(context, hp);
}
static int
-init_context()
+init_context(void)
{
if (!inited) {
inited = 1;
@@ -630,7 +614,7 @@ init_context()
}
static void
-translate_errors()
+translate_errors(void)
{
switch (errno) {
case ENOENT:
Index: src/lib/libc/net/ip6opt.c
diff -u src/lib/libc/net/ip6opt.c:1.13 src/lib/libc/net/ip6opt.c:1.14
--- src/lib/libc/net/ip6opt.c:1.13 Tue Mar 13 21:13:41 2012
+++ src/lib/libc/net/ip6opt.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6opt.c,v 1.13 2012/03/13 21:13:41 christos Exp $ */
+/* $NetBSD: ip6opt.c,v 1.14 2012/03/20 17:44:18 matt Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ip6opt.c,v 1.13 2012/03/13 21:13:41 christos Exp $");
+__RCSID("$NetBSD: ip6opt.c,v 1.14 2012/03/20 17:44:18 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -63,8 +63,8 @@ __weak_alias(inet6_opt_find, _inet6_opt_
__weak_alias(inet6_opt_get_val, _inet6_opt_get_val)
#endif
-static int ip6optlen(u_int8_t *opt, u_int8_t *lim);
-static void inet6_insert_padopt(u_char *p, size_t len);
+static int ip6optlen(uint8_t *opt, uint8_t *lim);
+static void inet6_insert_padopt(uint8_t *p, size_t len);
/*
* This function returns the number of bytes required to hold an option
@@ -76,8 +76,7 @@ static void inet6_insert_padopt(u_char *
* byte, the length byte, and the option data.
*/
int
-inet6_option_space(nbytes)
- int nbytes;
+inet6_option_space(int nbytes)
{
size_t sp;
nbytes += 2; /* we need space for nxt-hdr and length fields */
@@ -92,10 +91,7 @@ inet6_option_space(nbytes)
* success or -1 on an error.
*/
int
-inet6_option_init(bp, cmsgp, type)
- void *bp;
- struct cmsghdr **cmsgp;
- int type;
+inet6_option_init(void *bp, struct cmsghdr **cmsgp, int type)
{
register struct cmsghdr *ch;
@@ -127,20 +123,17 @@ inet6_option_init(bp, cmsgp, type)
* earlier. It must have a value between 0 and 7, inclusive.
*/
int
-inet6_option_append(cmsg, typep, multx, plusy)
- struct cmsghdr *cmsg;
- const u_int8_t *typep;
- int multx;
- int plusy;
+inet6_option_append(struct cmsghdr *cmsg, const uint8_t *typep, int multx,
+ int plusy)
{
size_t padlen, optlen, off;
- register u_char *bp;
+ register uint8_t *bp;
struct ip6_ext *eh;
_DIAGASSERT(cmsg != NULL);
_DIAGASSERT(typep != NULL);
- bp = (u_char *)(void *)cmsg + cmsg->cmsg_len;
+ bp = (uint8_t *)(void *)cmsg + cmsg->cmsg_len;
eh = (struct ip6_ext *)(void *)CMSG_DATA(cmsg);
/* argument validation */
@@ -154,13 +147,13 @@ inet6_option_append(cmsg, typep, multx,
* first 2 bytes(for next header and length fields) of
* the option header.
*/
- if (bp == (u_char *)(void *)eh) {
+ if (bp == (uint8_t *)(void *)eh) {
bp += 2;
cmsg->cmsg_len += 2;
}
/* calculate pad length before the option. */
- off = bp - (u_char *)(void *)eh;
+ off = bp - (uint8_t *)(void *)eh;
padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
(off % multx);
padlen += plusy;
@@ -182,7 +175,7 @@ inet6_option_append(cmsg, typep, multx,
cmsg->cmsg_len += (socklen_t)optlen;
/* calculate pad length after the option and insert the padding */
- off = bp - (u_char *)(void *)eh;
+ off = bp - (uint8_t *)(void *)eh;
padlen = ((off + 7) & ~7) - off;
inet6_insert_padopt(bp, padlen);
bp += padlen;
@@ -190,7 +183,7 @@ inet6_option_append(cmsg, typep, multx,
cmsg->cmsg_len += (socklen_t)padlen;
/* update the length field of the ip6 option header */
- off = bp - (u_char *)(void *)eh;
+ off = bp - (uint8_t *)(void *)eh;
_DIAGASSERT(__type_fit(uint8_t, (off >> 3) - 1));
eh->ip6e_len = (uint8_t)((off >> 3) - 1);
@@ -210,21 +203,17 @@ inet6_option_append(cmsg, typep, multx,
* then be built by the caller.
*
*/
-u_int8_t *
-inet6_option_alloc(cmsg, datalen, multx, plusy)
- struct cmsghdr *cmsg;
- int datalen;
- int multx;
- int plusy;
+uint8_t *
+inet6_option_alloc(struct cmsghdr *cmsg, int datalen, int multx, int plusy)
{
size_t padlen, off;
- register u_int8_t *bp;
- u_int8_t *retval;
+ register uint8_t *bp;
+ uint8_t *retval;
struct ip6_ext *eh;
_DIAGASSERT(cmsg != NULL);
- bp = (u_char *)(void *)cmsg + cmsg->cmsg_len;
+ bp = (uint8_t *)(void *)cmsg + cmsg->cmsg_len;
eh = (struct ip6_ext *)(void *)CMSG_DATA(cmsg);
/* argument validation */
@@ -238,13 +227,13 @@ inet6_option_alloc(cmsg, datalen, multx,
* first 2 bytes(for next header and length fields) of
* the option header.
*/
- if (bp == (u_char *)(void *)eh) {
+ if (bp == (uint8_t *)(void *)eh) {
bp += 2;
cmsg->cmsg_len += 2;
}
/* calculate pad length before the option. */
- off = bp - (u_char *)(void *)eh;
+ off = bp - (uint8_t *)(void *)eh;
padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
(off % multx);
padlen += plusy;
@@ -260,7 +249,7 @@ inet6_option_alloc(cmsg, datalen, multx,
cmsg->cmsg_len += datalen;
/* calculate pad length after the option and insert the padding */
- off = bp - (u_char *)(void *)eh;
+ off = bp - (uint8_t *)(void *)eh;
padlen = ((off + 7) & ~7) - off;
inet6_insert_padopt(bp, padlen);
bp += padlen;
@@ -268,7 +257,7 @@ inet6_option_alloc(cmsg, datalen, multx,
cmsg->cmsg_len += (socklen_t)padlen;
/* update the length field of the ip6 option header */
- off = bp - (u_char *)(void *)eh;
+ off = bp - (uint8_t *)(void *)eh;
_DIAGASSERT(__type_fit(uint8_t, (off >> 3) - 1));
eh->ip6e_len = (uint8_t)((off >> 3) - 1);
@@ -286,13 +275,11 @@ inet6_option_alloc(cmsg, datalen, multx,
* (RFC 2292, 6.3.5)
*/
int
-inet6_option_next(cmsg, tptrp)
- const struct cmsghdr *cmsg;
- u_int8_t **tptrp;
+inet6_option_next(const struct cmsghdr *cmsg, uint8_t **tptrp)
{
struct ip6_ext *ip6e;
int hdrlen, optlen;
- u_int8_t *lim;
+ uint8_t *lim;
_DIAGASSERT(cmsg != NULL);
_DIAGASSERT(tptrp != NULL);
@@ -315,9 +302,9 @@ inet6_option_next(cmsg, tptrp)
* simply return the 1st option.
* Otherwise, search the option list for the next option.
*/
- lim = (u_int8_t *)(void *)ip6e + hdrlen;
+ lim = (uint8_t *)(void *)ip6e + hdrlen;
if (*tptrp == NULL)
- *tptrp = (u_int8_t *)(void *)(ip6e + 1);
+ *tptrp = (uint8_t *)(void *)(ip6e + 1);
else {
if ((optlen = ip6optlen(*tptrp, lim)) == 0)
return(-1);
@@ -343,18 +330,15 @@ inet6_option_next(cmsg, tptrp)
* except this function lets the caller specify the option type to be
* searched for, instead of always returning the next option in the
* ancillary data object.
- * Note: RFC 2292 says the type of tptrp is u_int8_t *, but we think
- * it's a typo. The variable should be type of u_int8_t **.
+ * Note: RFC 2292 says the type of tptrp is uint8_t *, but we think
+ * it's a typo. The variable should be type of uint8_t **.
*/
int
-inet6_option_find(cmsg, tptrp, type)
- const struct cmsghdr *cmsg;
- u_int8_t **tptrp;
- int type;
+inet6_option_find(const struct cmsghdr *cmsg, uint8_t **tptrp, int type)
{
struct ip6_ext *ip6e;
int hdrlen, optlen;
- u_int8_t *optp, *lim;
+ uint8_t *optp, *lim;
_DIAGASSERT(cmsg != NULL);
_DIAGASSERT(tptrp != NULL);
@@ -377,9 +361,9 @@ inet6_option_find(cmsg, tptrp, type)
* search from the beginning of the option list.
* Otherwise, search from *the next option* of the specified point.
*/
- lim = (u_int8_t *)(void *)ip6e + hdrlen;
+ lim = (uint8_t *)(void *)ip6e + hdrlen;
if (*tptrp == NULL)
- *tptrp = (u_int8_t *)(void *)(ip6e + 1);
+ *tptrp = (uint8_t *)(void *)(ip6e + 1);
else {
if ((optlen = ip6optlen(*tptrp, lim)) == 0)
return(-1);
@@ -406,8 +390,7 @@ inet6_option_find(cmsg, tptrp, type)
* calculated length and the limitation of the buffer.
*/
static int
-ip6optlen(opt, lim)
- u_int8_t *opt, *lim;
+ip6optlen(uint8_t *opt, uint8_t *lim)
{
int optlen;
@@ -429,7 +412,7 @@ ip6optlen(opt, lim)
}
static void
-inet6_insert_padopt(u_char *p, size_t len)
+inet6_insert_padopt(uint8_t *p, size_t len)
{
_DIAGASSERT(p != NULL);
@@ -442,8 +425,8 @@ inet6_insert_padopt(u_char *p, size_t le
return;
default:
p[0] = IP6OPT_PADN;
- _DIAGASSERT(__type_fit(u_char, len - 2));
- p[1] = (u_char)(len - 2);
+ _DIAGASSERT(__type_fit(uint8_t, len - 2));
+ p[1] = (uint8_t)(len - 2);
memset(&p[2], 0, len - 2);
return;
}
@@ -472,8 +455,8 @@ inet6_opt_init(void *extbuf, socklen_t e
}
int
-inet6_opt_append(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
- socklen_t len, u_int8_t align, void **databufp)
+inet6_opt_append(void *extbuf, socklen_t extlen, int offset, uint8_t type,
+ socklen_t len, uint8_t align, void **databufp)
{
int currentlen = offset;
size_t padlen = 0;
@@ -514,7 +497,7 @@ inet6_opt_append(void *extbuf, socklen_t
return (-1);
if (extbuf) {
- u_int8_t *optp = (u_int8_t *)extbuf + offset;
+ uint8_t *optp = (uint8_t *)extbuf + offset;
if (padlen == 1) {
/* insert a Pad1 option */
@@ -544,13 +527,13 @@ inet6_opt_finish(void *extbuf, socklen_t
int updatelen = offset > 0 ? (1 + ((offset - 1) | 7)) : 0;
if (extbuf) {
- u_int8_t *padp;
+ uint8_t *padp;
size_t padlen = updatelen - offset;
if ((socklen_t)updatelen > extlen || padlen >= 256 + 2)
return (-1);
- padp = (u_int8_t *)extbuf + offset;
+ padp = (uint8_t *)extbuf + offset;
if (padlen == 1)
*padp = IP6OPT_PAD1;
else if (padlen > 0) {
@@ -567,21 +550,21 @@ int
inet6_opt_set_val(void *databuf, int offset, void *val, socklen_t vallen)
{
- memcpy((u_int8_t *)databuf + offset, val, vallen);
+ memcpy((uint8_t *)databuf + offset, val, vallen);
return (offset + vallen);
}
int
-inet6_opt_next(void *extbuf, socklen_t extlen, int offset, u_int8_t *typep,
+inet6_opt_next(void *extbuf, socklen_t extlen, int offset, uint8_t *typep,
socklen_t *lenp, void **databufp)
{
- u_int8_t *optp, *lim;
+ uint8_t *optp, *lim;
int optlen;
/* Validate extlen. XXX: is the variable really necessary?? */
if (extlen == 0 || (extlen % 8))
return (-1);
- lim = (u_int8_t *)extbuf + extlen;
+ lim = (uint8_t *)extbuf + extlen;
/*
* If this is the first time this function called for this options
@@ -589,9 +572,9 @@ inet6_opt_next(void *extbuf, socklen_t e
* Otherwise, search the option list for the next option.
*/
if (offset == 0)
- optp = (u_int8_t *)(void *)((struct ip6_hbh *)extbuf + 1);
+ optp = (uint8_t *)(void *)((struct ip6_hbh *)extbuf + 1);
else
- optp = (u_int8_t *)extbuf + offset;
+ optp = (uint8_t *)extbuf + offset;
/* Find the next option skipping any padding options. */
while (optp < lim) {
@@ -611,7 +594,7 @@ inet6_opt_next(void *extbuf, socklen_t e
*typep = *optp;
*lenp = optlen - 2;
*databufp = optp + 2;
- rv = optp + optlen - (u_int8_t *)extbuf;
+ rv = optp + optlen - (uint8_t *)extbuf;
_DIAGASSERT(__type_fit(int, rv));
return (int)rv;
}
@@ -623,16 +606,16 @@ inet6_opt_next(void *extbuf, socklen_t e
}
int
-inet6_opt_find(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
+inet6_opt_find(void *extbuf, socklen_t extlen, int offset, uint8_t type,
socklen_t *lenp, void **databufp)
{
- u_int8_t *optp, *lim;
+ uint8_t *optp, *lim;
int optlen;
/* Validate extlen. XXX: is the variable really necessary?? */
if (extlen == 0 || (extlen % 8))
return (-1);
- lim = (u_int8_t *)extbuf + extlen;
+ lim = (uint8_t *)extbuf + extlen;
/*
* If this is the first time this function called for this options
@@ -640,9 +623,9 @@ inet6_opt_find(void *extbuf, socklen_t e
* Otherwise, search the option list for the next option.
*/
if (offset == 0)
- optp = (u_int8_t *)(void *)((struct ip6_hbh *)extbuf + 1);
+ optp = (uint8_t *)(void *)((struct ip6_hbh *)extbuf + 1);
else
- optp = (u_int8_t *)extbuf + offset;
+ optp = (uint8_t *)extbuf + offset;
/* Find the specified option */
while (optp < lim) {
@@ -653,7 +636,7 @@ inet6_opt_find(void *extbuf, socklen_t e
ptrdiff_t td;
*lenp = optlen - 2;
*databufp = optp + 2;
- td = optp + optlen - (u_int8_t *)extbuf;
+ td = optp + optlen - (uint8_t *)extbuf;
_DIAGASSERT(__type_fit(int, td));
return (int)td;
}
@@ -671,7 +654,7 @@ inet6_opt_get_val(void *databuf, int off
{
/* we can't assume alignment here */
- memcpy(val, (u_int8_t *)databuf + offset, vallen);
+ memcpy(val, (uint8_t *)databuf + offset, vallen);
return (offset + vallen);
}
Index: src/lib/libc/net/iso_addr.c
diff -u src/lib/libc/net/iso_addr.c:1.13 src/lib/libc/net/iso_addr.c:1.14
--- src/lib/libc/net/iso_addr.c:1.13 Tue Mar 13 21:13:41 2012
+++ src/lib/libc/net/iso_addr.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iso_addr.c,v 1.13 2012/03/13 21:13:41 christos Exp $ */
+/* $NetBSD: iso_addr.c,v 1.14 2012/03/20 17:44:18 matt Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)iso_addr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: iso_addr.c,v 1.13 2012/03/13 21:13:41 christos Exp $");
+__RCSID("$NetBSD: iso_addr.c,v 1.14 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -54,8 +54,7 @@ __RCSID("$NetBSD: iso_addr.c,v 1.13 2012
#define DELIM (4*2)
struct iso_addr *
-iso_addr(addr)
- register const char *addr;
+iso_addr(const char *addr)
{
static struct iso_addr out_addr;
register char *cp = out_addr.isoa_genaddr;
@@ -103,8 +102,7 @@ iso_addr(addr)
static const char hexlist[16] = "0123456789abcdef";
char *
-iso_ntoa(isoa)
- const struct iso_addr *isoa;
+iso_ntoa(const struct iso_addr *isoa)
{
static char obuf[64];
char *out = obuf;
Index: src/lib/libc/net/linkaddr.c
diff -u src/lib/libc/net/linkaddr.c:1.15 src/lib/libc/net/linkaddr.c:1.16
--- src/lib/libc/net/linkaddr.c:1.15 Tue Mar 13 21:13:41 2012
+++ src/lib/libc/net/linkaddr.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: linkaddr.c,v 1.15 2012/03/13 21:13:41 christos Exp $ */
+/* $NetBSD: linkaddr.c,v 1.16 2012/03/20 17:44:18 matt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: linkaddr.c,v 1.15 2012/03/13 21:13:41 christos Exp $");
+__RCSID("$NetBSD: linkaddr.c,v 1.16 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -135,8 +135,7 @@ link_addr(const char *addr, struct socka
static const char hexlist[16] = "0123456789abcdef";
char *
-link_ntoa(sdl)
- register const struct sockaddr_dl *sdl;
+link_ntoa(const struct sockaddr_dl *sdl)
{
static char obuf[64];
register char *out = obuf;
Index: src/lib/libc/net/nslexer.l
diff -u src/lib/libc/net/nslexer.l:1.11 src/lib/libc/net/nslexer.l:1.12
--- src/lib/libc/net/nslexer.l:1.11 Wed Dec 8 03:19:19 2010
+++ src/lib/libc/net/nslexer.l Tue Mar 20 17:44:18 2012
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: nslexer.l,v 1.11 2010/12/08 03:19:19 christos Exp $ */
+/* $NetBSD: nslexer.l,v 1.12 2012/03/20 17:44:18 matt Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nslexer.l,v 1.11 2010/12/08 03:19:19 christos Exp $");
+__RCSID("$NetBSD: nslexer.l,v 1.12 2012/03/20 17:44:18 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -94,7 +94,7 @@ STRING [a-zA-Z][a-zA-Z0-9_]*
#undef _nsyywrap
int
-_nsyywrap()
+_nsyywrap(void)
{
return 1;
} /* _nsyywrap */
Index: src/lib/libc/net/nsparser.y
diff -u src/lib/libc/net/nsparser.y:1.11 src/lib/libc/net/nsparser.y:1.12
--- src/lib/libc/net/nsparser.y:1.11 Thu Feb 5 13:21:11 2009
+++ src/lib/libc/net/nsparser.y Tue Mar 20 17:44:18 2012
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: nsparser.y,v 1.11 2009/02/05 13:21:11 lukem Exp $ */
+/* $NetBSD: nsparser.y,v 1.12 2012/03/20 17:44:18 matt Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nsparser.y,v 1.11 2009/02/05 13:21:11 lukem Exp $");
+__RCSID("$NetBSD: nsparser.y,v 1.12 2012/03/20 17:44:18 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: nsparser.y,v 1.11 2009
#include <syslog.h>
-static void _nsaddsrctomap __P((const char *));
+static void _nsaddsrctomap(const char *);
static ns_dbt curdbt;
static ns_src cursrc;
@@ -154,8 +154,7 @@ Action
%%
static void
-_nsaddsrctomap(elem)
- const char *elem;
+_nsaddsrctomap(const char *elem)
{
unsigned int i;
int lineno;
Index: src/lib/libc/net/recv.c
diff -u src/lib/libc/net/recv.c:1.9 src/lib/libc/net/recv.c:1.10
--- src/lib/libc/net/recv.c:1.9 Wed Oct 22 15:40:19 2003
+++ src/lib/libc/net/recv.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: recv.c,v 1.9 2003/10/22 15:40:19 drochner Exp $ */
+/* $NetBSD: recv.c,v 1.10 2012/03/20 17:44:18 matt Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)recv.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: recv.c,v 1.9 2003/10/22 15:40:19 drochner Exp $");
+__RCSID("$NetBSD: recv.c,v 1.10 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -44,10 +44,7 @@ __RCSID("$NetBSD: recv.c,v 1.9 2003/10/2
#include <stddef.h>
ssize_t
-recv(s, buf, len, flags)
- int s, flags;
- size_t len;
- void *buf;
+recv(int s, void *buf, size_t len, int flags)
{
return (recvfrom(s, buf, len, flags, NULL, NULL));
}
Index: src/lib/libc/net/send.c
diff -u src/lib/libc/net/send.c:1.9 src/lib/libc/net/send.c:1.10
--- src/lib/libc/net/send.c:1.9 Thu Aug 7 16:43:15 2003
+++ src/lib/libc/net/send.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: send.c,v 1.9 2003/08/07 16:43:15 agc Exp $ */
+/* $NetBSD: send.c,v 1.10 2012/03/20 17:44:18 matt Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)send.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: send.c,v 1.9 2003/08/07 16:43:15 agc Exp $");
+__RCSID("$NetBSD: send.c,v 1.10 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -49,10 +49,8 @@ __weak_alias(send, _send)
#endif
ssize_t
-send(s, msg, len, flags)
- int s, flags;
- size_t len;
- const void *msg;
+send(int s, const void *msg, size_t len, int flags)
{
+
return (sendto(s, msg, len, flags, NULL, 0));
}
Index: src/lib/libc/net/sethostent.c
diff -u src/lib/libc/net/sethostent.c:1.16 src/lib/libc/net/sethostent.c:1.17
--- src/lib/libc/net/sethostent.c:1.16 Sat Jan 27 22:27:35 2007
+++ src/lib/libc/net/sethostent.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sethostent.c,v 1.16 2007/01/27 22:27:35 christos Exp $ */
+/* $NetBSD: sethostent.c,v 1.17 2012/03/20 17:44:18 matt Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)sethostent.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: sethostent.c,v 8.5 1996/09/28 06:51:07 vixie Exp ";
#else
-__RCSID("$NetBSD: sethostent.c,v 1.16 2007/01/27 22:27:35 christos Exp $");
+__RCSID("$NetBSD: sethostent.c,v 1.17 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -51,16 +51,15 @@ __weak_alias(sethostent,_sethostent)
__weak_alias(endhostent,_endhostent)
#endif
-void _endhtent __P((void));
+void _endhtent(void);
#ifndef _REENTRANT
-void res_close __P((void));
+void res_close(void);
#endif
-void _sethtent __P((int));
+void _sethtent(int);
void
/*ARGSUSED*/
-sethostent(stayopen)
- int stayopen;
+sethostent(int stayopen)
{
#ifndef _REENTRANT
if ((_res.options & RES_INIT) == 0 && res_init() == -1)
@@ -72,7 +71,7 @@ sethostent(stayopen)
}
void
-endhostent()
+endhostent(void)
{
#ifndef _REENTRANT
_res.options &= ~(RES_STAYOPEN | RES_USEVC);
Index: src/lib/libc/net/sockatmark.c
diff -u src/lib/libc/net/sockatmark.c:1.2 src/lib/libc/net/sockatmark.c:1.3
--- src/lib/libc/net/sockatmark.c:1.2 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/net/sockatmark.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sockatmark.c,v 1.2 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: sockatmark.c,v 1.3 2012/03/20 17:44:18 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockatmark.c,v 1.2 2008/04/28 20:23:00 martin Exp $");
+__RCSID("$NetBSD: sockatmark.c,v 1.3 2012/03/20 17:44:18 matt Exp $");
#endif
#include "namespace.h"
@@ -42,8 +42,7 @@ __RCSID("$NetBSD: sockatmark.c,v 1.2 200
#include <assert.h>
int
-sockatmark(s)
- int s;
+sockatmark(int s)
{
int val;
Index: src/lib/libc/nls/catopen.c
diff -u src/lib/libc/nls/catopen.c:1.29 src/lib/libc/nls/catopen.c:1.30
--- src/lib/libc/nls/catopen.c:1.29 Fri Jan 20 16:31:30 2012
+++ src/lib/libc/nls/catopen.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: catopen.c,v 1.29 2012/01/20 16:31:30 joerg Exp $ */
+/* $NetBSD: catopen.c,v 1.30 2012/03/20 17:44:18 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: catopen.c,v 1.29 2012/01/20 16:31:30 joerg Exp $");
+__RCSID("$NetBSD: catopen.c,v 1.30 2012/03/20 17:44:18 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#define _NLS_PRIVATE
@@ -65,12 +65,10 @@ __RCSID("$NetBSD: catopen.c,v 1.29 2012/
__weak_alias(catopen, _catopen)
#endif
-static nl_catd load_msgcat __P((const char *));
+static nl_catd load_msgcat(const char *);
nl_catd
-_catopen(name, oflag)
- const char *name;
- int oflag;
+_catopen(const char *name, int oflag)
{
char tmppath[PATH_MAX+1];
const char *nlspath;
@@ -147,8 +145,7 @@ _catopen(name, oflag)
}
static nl_catd
-load_msgcat(path)
- const char *path;
+load_msgcat(const char *path)
{
struct stat st;
nl_catd catd;
Index: src/lib/libc/resolv/res_init.c
diff -u src/lib/libc/resolv/res_init.c:1.24 src/lib/libc/resolv/res_init.c:1.25
--- src/lib/libc/resolv/res_init.c:1.24 Tue Mar 13 21:13:43 2012
+++ src/lib/libc/resolv/res_init.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: res_init.c,v 1.24 2012/03/13 21:13:43 christos Exp $ */
+/* $NetBSD: res_init.c,v 1.25 2012/03/20 17:44:18 matt Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@@ -76,7 +76,7 @@
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp";
#else
-__RCSID("$NetBSD: res_init.c,v 1.24 2012/03/13 21:13:43 christos Exp $");
+__RCSID("$NetBSD: res_init.c,v 1.25 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -147,12 +147,12 @@ __weak_alias(res_setservers,__res_setser
#include <sys/systeminfo.h>
#endif
-static void res_setoptions __P((res_state, const char *, const char *));
+static void res_setoptions(res_state, const char *, const char *);
#ifdef RESOLVSORT
static const char sort_mask[] = "/&";
#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
+static uint32_t net_mask(struct in_addr);
#endif
#if !defined(isascii) /*%< XXX - could be a function */
@@ -725,11 +725,10 @@ res_setoptions(res_state statp, const ch
#ifdef RESOLVSORT
/* XXX - should really support CIDR which means explicit masks always. */
-static u_int32_t
-net_mask(in) /*!< XXX - should really use system's version of this */
- struct in_addr in;
+static uint32_t
+net_mask(struct in_addr in) /*!< XXX - should really use system's version of this */
{
- register u_int32_t i = ntohl(in.s_addr);
+ register uint32_t i = ntohl(in.s_addr);
if (IN_CLASSA(i))
return (htonl(IN_CLASSA_NET));
@@ -745,30 +744,31 @@ void
res_rndinit(res_state statp)
{
struct timeval now;
- u_int32_t u32;
- u_int16_t u16;
+ uint32_t u32;
+ uint16_t u16;
u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd;
gettimeofday(&now, NULL);
- u32 = (u_int32_t)now.tv_sec;
+ u32 = (uint32_t)now.tv_sec;
memcpy(rnd, &u32, 4);
u32 = now.tv_usec;
memcpy(rnd + 4, &u32, 4);
- u32 += (u_int32_t)now.tv_sec;
+ u32 += (uint32_t)now.tv_sec;
memcpy(rnd + 8, &u32, 4);
u16 = getpid();
memcpy(rnd + 12, &u16, 2);
}
u_int
-res_nrandomid(res_state statp) {
+res_nrandomid(res_state statp)
+{
struct timeval now;
- u_int16_t u16;
+ uint16_t u16;
MD5_CTX ctx;
u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd;
gettimeofday(&now, NULL);
- u16 = (u_int16_t) (now.tv_sec ^ now.tv_usec);
+ u16 = (uint16_t) (now.tv_sec ^ now.tv_usec);
memcpy(rnd + 14, &u16, 2);
#ifndef HAVE_MD5
MD5_Init(&ctx);
@@ -791,7 +791,8 @@ res_nrandomid(res_state statp) {
* This routine is not expected to be user visible.
*/
void
-res_nclose(res_state statp) {
+res_nclose(res_state statp)
+{
int ns;
if (statp->_vcsock >= 0) {
@@ -808,7 +809,8 @@ res_nclose(res_state statp) {
}
void
-res_ndestroy(res_state statp) {
+res_ndestroy(res_state statp)
+{
res_nclose(statp);
if (statp->_u._ext.ext != NULL) {
if (statp->_u._ext.ext->kq != -1)
@@ -826,21 +828,24 @@ res_ndestroy(res_state statp) {
}
const char *
-res_get_nibblesuffix(res_state statp) {
+res_get_nibblesuffix(res_state statp)
+{
if (statp->_u._ext.ext)
return (statp->_u._ext.ext->nsuffix);
return ("ip6.arpa");
}
const char *
-res_get_nibblesuffix2(res_state statp) {
+res_get_nibblesuffix2(res_state statp)
+{
if (statp->_u._ext.ext)
return (statp->_u._ext.ext->nsuffix2);
return ("ip6.int");
}
void
-res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt) {
+res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt)
+{
int i, nserv;
size_t size;
@@ -891,10 +896,11 @@ res_setservers(res_state statp, const un
}
int
-res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) {
+res_getservers(res_state statp, union res_sockaddr_union *set, int cnt)
+{
int i;
size_t size;
- u_int16_t family;
+ uint16_t family;
for (i = 0; i < statp->nscount && i < cnt; i++) {
if (statp->_u._ext.ext)
Index: src/lib/libc/resolv/res_send.c
diff -u src/lib/libc/resolv/res_send.c:1.23 src/lib/libc/resolv/res_send.c:1.24
--- src/lib/libc/resolv/res_send.c:1.23 Tue Mar 13 21:13:44 2012
+++ src/lib/libc/resolv/res_send.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: res_send.c,v 1.23 2012/03/13 21:13:44 christos Exp $ */
+/* $NetBSD: res_send.c,v 1.24 2012/03/20 17:44:18 matt Exp $ */
/*
* Portions Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
@@ -93,7 +93,7 @@
static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp";
#else
-__RCSID("$NetBSD: res_send.c,v 1.23 2012/03/13 21:13:44 christos Exp $");
+__RCSID("$NetBSD: res_send.c,v 1.24 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -162,8 +162,8 @@ static const int highestFD = FD_SETSIZE
/* Forward. */
-static int get_salen __P((const struct sockaddr *));
-static struct sockaddr * get_nsaddr __P((res_state, size_t));
+static int get_salen(const struct sockaddr *);
+static struct sockaddr * get_nsaddr(res_state, size_t);
static int send_vc(res_state, const u_char *, int,
u_char *, int, int *, int);
static int send_dg(res_state, const u_char *, int,
@@ -577,8 +577,7 @@ res_nsend(res_state statp,
/* Private */
static int
-get_salen(sa)
- const struct sockaddr *sa;
+get_salen(const struct sockaddr *sa)
{
#ifdef HAVE_SA_LEN
@@ -599,9 +598,7 @@ get_salen(sa)
* pick appropriate nsaddr_list for use. see res_init() for initialization.
*/
static struct sockaddr *
-get_nsaddr(statp, n)
- res_state statp;
- size_t n;
+get_nsaddr(res_state statp, size_t n)
{
if (!statp->nsaddr_list[n].sin_family && EXT(statp).ext) {
Index: src/lib/libc/string/__strsignal.c
diff -u src/lib/libc/string/__strsignal.c:1.24 src/lib/libc/string/__strsignal.c:1.25
--- src/lib/libc/string/__strsignal.c:1.24 Thu Aug 7 16:43:46 2003
+++ src/lib/libc/string/__strsignal.c Tue Mar 20 17:44:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: __strsignal.c,v 1.24 2003/08/07 16:43:46 agc Exp $ */
+/* $NetBSD: __strsignal.c,v 1.25 2012/03/20 17:44:18 matt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -34,7 +34,7 @@
#if 0
static char *sccsid = "@(#)strerror.c 5.6 (Berkeley) 5/4/91";
#else
-__RCSID("$NetBSD: __strsignal.c,v 1.24 2003/08/07 16:43:46 agc Exp $");
+__RCSID("$NetBSD: __strsignal.c,v 1.25 2012/03/20 17:44:18 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,10 +56,7 @@ __RCSID("$NetBSD: __strsignal.c,v 1.24 2
/* ARGSUSED */
const char *
-__strsignal(num, buf, buflen)
- int num;
- char *buf;
- size_t buflen;
+__strsignal(int num, char *buf, size_t buflen)
{
#define UPREFIX "Unknown signal: %u"
#define RPREFIX "Real time signal %u"
