summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libc/compat-43/creat.c10
-rw-r--r--lib/libc/compat-43/getwd.c8
-rw-r--r--lib/libc/gen/__fts13.c39
-rw-r--r--lib/libc/gen/__glob13.c18
-rw-r--r--lib/libc/gen/closedir.c10
-rw-r--r--lib/libc/gen/disklabel.c8
-rw-r--r--lib/libc/gen/execvp.c11
-rw-r--r--lib/libc/gen/fnmatch.c9
-rw-r--r--lib/libc/gen/fstab.c12
-rw-r--r--lib/libc/gen/ftok.c10
-rw-r--r--lib/libc/gen/getbsize.c8
-rw-r--r--lib/libc/gen/getcap.c46
-rw-r--r--lib/libc/gen/getcwd.c14
-rw-r--r--lib/libc/gen/getdomainname.c10
-rw-r--r--lib/libc/gen/getgrent.c8
-rw-r--r--lib/libc/gen/getgrouplist.c8
-rw-r--r--lib/libc/gen/gethostname.c10
-rw-r--r--lib/libc/gen/getloadavg.c10
-rw-r--r--lib/libc/gen/getmntinfo.c10
-rw-r--r--lib/libc/gen/getnetgrent.c24
-rw-r--r--lib/libc/gen/getsubopt.c8
-rw-r--r--lib/libc/gen/getttyent.c8
-rw-r--r--lib/libc/gen/initgroups.c8
-rw-r--r--lib/libc/gen/isatty.c10
-rw-r--r--lib/libc/gen/nlist.c20
-rw-r--r--lib/libc/gen/nlist_aout.c14
-rw-r--r--lib/libc/gen/nlist_ecoff.c14
-rw-r--r--lib/libc/gen/nlist_elf32.c12
-rw-r--r--lib/libc/gen/opendir.c14
-rw-r--r--lib/libc/gen/popen.c16
-rw-r--r--lib/libc/gen/pw_scan.c8
-rw-r--r--lib/libc/gen/readdir.c10
-rw-r--r--lib/libc/gen/rewinddir.c8
-rw-r--r--lib/libc/gen/scandir.c10
-rw-r--r--lib/libc/gen/seekdir.c8
-rw-r--r--lib/libc/gen/setdomainname.c10
-rw-r--r--lib/libc/gen/sethostname.c10
-rw-r--r--lib/libc/gen/setmode.c8
-rw-r--r--lib/libc/gen/sysctl.c10
-rw-r--r--lib/libc/gen/telldir.c8
-rw-r--r--lib/libc/gen/times.c10
-rw-r--r--lib/libc/gen/ttyname.c10
-rw-r--r--lib/libc/gen/uname.c10
-rw-r--r--lib/libc/gen/unvis.c12
-rw-r--r--lib/libc/gen/utime.c10
-rw-r--r--lib/libc/gen/vis.c16
-rw-r--r--lib/libc/hash/sha1.c18
-rw-r--r--lib/libc/hash/sha1hl.c16
-rw-r--r--lib/libc/locale/ctypeio.c11
-rw-r--r--lib/libc/md/md4c.c14
-rw-r--r--lib/libc/md/md5c.c14
-rw-r--r--lib/libc/md/mdXhl.c14
-rw-r--r--lib/libc/net/base64.c12
-rw-r--r--lib/libc/net/ethers.c28
-rw-r--r--lib/libc/net/getaddrinfo.c12
-rw-r--r--lib/libc/net/gethnamaddr.c25
-rw-r--r--lib/libc/net/getnetnamadr.c12
-rw-r--r--lib/libc/net/getprotoname.c8
-rw-r--r--lib/libc/net/getservbyname.c8
-rw-r--r--lib/libc/net/hesiod.c34
-rw-r--r--lib/libc/net/ifname.c18
-rw-r--r--lib/libc/net/inet_net_ntop.c10
-rw-r--r--lib/libc/net/inet_net_pton.c10
-rw-r--r--lib/libc/net/inet_neta.c10
-rw-r--r--lib/libc/net/inet_network.c8
-rw-r--r--lib/libc/net/inet_ntop.c10
-rw-r--r--lib/libc/net/inet_pton.c18
-rw-r--r--lib/libc/net/ip6opt.c26
-rw-r--r--lib/libc/net/iso_addr.c12
-rw-r--r--lib/libc/net/linkaddr.c12
-rw-r--r--lib/libc/net/ns_addr.c8
-rw-r--r--lib/libc/net/nsap_addr.c12
-rw-r--r--lib/libc/net/nsdispatch.c20
-rw-r--r--lib/libc/net/rcmd.c36
-rw-r--r--lib/libc/net/res_comp.c48
-rw-r--r--lib/libc/net/res_debug.c64
-rw-r--r--lib/libc/net/res_mkquery.c11
-rw-r--r--lib/libc/net/res_query.c26
-rw-r--r--lib/libc/net/res_send.c22
-rw-r--r--lib/libc/net/rthdr.c26
-rw-r--r--lib/libc/regex/regcomp.c8
-rw-r--r--lib/libc/regex/regerror.c8
-rw-r--r--lib/libc/regex/regexec.c8
-rw-r--r--lib/libc/regex/regfree.c8
-rw-r--r--lib/libc/rpc/authunix_prot.c8
-rw-r--r--lib/libc/rpc/clnt_generic.c11
-rw-r--r--lib/libc/rpc/clnt_perror.c26
-rw-r--r--lib/libc/rpc/clnt_simple.c8
-rw-r--r--lib/libc/rpc/clnt_tcp.c11
-rw-r--r--lib/libc/rpc/clnt_udp.c11
-rw-r--r--lib/libc/rpc/get_myaddress.c8
-rw-r--r--lib/libc/rpc/getrpcent.c8
-rw-r--r--lib/libc/rpc/getrpcport.c8
-rw-r--r--lib/libc/rpc/pmap_getmaps.c8
-rw-r--r--lib/libc/rpc/pmap_getport.c8
-rw-r--r--lib/libc/rpc/pmap_prot.c8
-rw-r--r--lib/libc/rpc/pmap_prot2.c8
-rw-r--r--lib/libc/rpc/pmap_rmt.c18
-rw-r--r--lib/libc/rpc/rpc_callmsg.c8
-rw-r--r--lib/libc/rpc/rpc_prot.c32
-rw-r--r--lib/libc/rpc/svc.c52
-rw-r--r--lib/libc/rpc/svc_auth.c8
-rw-r--r--lib/libc/rpc/svc_auth_unix.c8
-rw-r--r--lib/libc/rpc/svc_tcp.c14
-rw-r--r--lib/libc/stdio/asprintf.c10
-rw-r--r--lib/libc/stdio/clrerr.c8
-rw-r--r--lib/libc/stdio/fclose.c10
-rw-r--r--lib/libc/stdio/fdopen.c10
-rw-r--r--lib/libc/stdio/feof.c8
-rw-r--r--lib/libc/stdio/ferror.c8
-rw-r--r--lib/libc/stdio/fflush.c8
-rw-r--r--lib/libc/stdio/fgetc.c10
-rw-r--r--lib/libc/stdio/fgetln.c12
-rw-r--r--lib/libc/stdio/fgetpos.c10
-rw-r--r--lib/libc/stdio/fgets.c8
-rw-r--r--lib/libc/stdio/fileno.c10
-rw-r--r--lib/libc/stdio/flags.c8
-rw-r--r--lib/libc/stdio/fopen.c8
-rw-r--r--lib/libc/stdio/fprintf.c14
-rw-r--r--lib/libc/stdio/fpurge.c10
-rw-r--r--lib/libc/stdio/fputc.c10
-rw-r--r--lib/libc/stdio/fputs.c14
-rw-r--r--lib/libc/stdio/fread.c14
-rw-r--r--lib/libc/stdio/freopen.c18
-rw-r--r--lib/libc/stdio/fscanf.c14
-rw-r--r--lib/libc/stdio/fseek.c10
-rw-r--r--lib/libc/stdio/fsetpos.c14
-rw-r--r--lib/libc/stdio/ftell.c11
-rw-r--r--lib/libc/stdio/fvwrite.c14
-rw-r--r--lib/libc/stdio/fwalk.c10
-rw-r--r--lib/libc/stdio/fwrite.c14
-rw-r--r--lib/libc/stdio/getc.c16
-rw-r--r--lib/libc/stdio/gets.c10
-rw-r--r--lib/libc/stdio/gettemp.c10
-rw-r--r--lib/libc/stdio/getw.c10
-rw-r--r--lib/libc/stdio/makebuf.c12
-rw-r--r--lib/libc/stdio/mkdtemp.c10
-rw-r--r--lib/libc/stdio/mkstemp.c10
-rw-r--r--lib/libc/stdio/mktemp.c16
-rw-r--r--lib/libc/stdio/printf.c11
-rw-r--r--lib/libc/stdio/putc.c16
-rw-r--r--lib/libc/stdio/puts.c10
-rw-r--r--lib/libc/stdio/putw.c10
-rw-r--r--lib/libc/stdio/refill.c10
-rw-r--r--lib/libc/stdio/remove.c10
-rw-r--r--lib/libc/stdio/rewind.c10
-rw-r--r--lib/libc/stdio/rget.c10
-rw-r--r--lib/libc/stdio/scanf.c10
-rw-r--r--lib/libc/stdio/setbuf.c10
-rw-r--r--lib/libc/stdio/setbuffer.c16
-rw-r--r--lib/libc/stdio/setvbuf.c10
-rw-r--r--lib/libc/stdio/snprintf.c10
-rw-r--r--lib/libc/stdio/sprintf.c10
-rw-r--r--lib/libc/stdio/sscanf.c10
-rw-r--r--lib/libc/stdio/stdio.c36
-rw-r--r--lib/libc/stdio/ungetc.c10
-rw-r--r--lib/libc/stdio/vasprintf.c10
-rw-r--r--lib/libc/stdio/vfprintf.c14
-rw-r--r--lib/libc/stdio/vfscanf.c14
-rw-r--r--lib/libc/stdio/vprintf.c10
-rw-r--r--lib/libc/stdio/vscanf.c10
-rw-r--r--lib/libc/stdio/vsnprintf.c10
-rw-r--r--lib/libc/stdio/vsprintf.c10
-rw-r--r--lib/libc/stdio/vsscanf.c10
-rw-r--r--lib/libc/stdio/wbuf.c10
-rw-r--r--lib/libc/stdio/wsetup.c10
-rw-r--r--lib/libc/stdlib/_rand48.c6
-rw-r--r--lib/libc/stdlib/a64l.c6
-rw-r--r--lib/libc/stdlib/atexit.c10
-rw-r--r--lib/libc/stdlib/atof.c8
-rw-r--r--lib/libc/stdlib/atoi.c8
-rw-r--r--lib/libc/stdlib/atol.c8
-rw-r--r--lib/libc/stdlib/bsearch.c10
-rw-r--r--lib/libc/stdlib/erand48.c6
-rw-r--r--lib/libc/stdlib/getenv.c10
-rw-r--r--lib/libc/stdlib/getopt.c11
-rw-r--r--lib/libc/stdlib/getopt_long.c13
-rw-r--r--lib/libc/stdlib/getsubopt.c8
-rw-r--r--lib/libc/stdlib/heapsort.c10
-rw-r--r--lib/libc/stdlib/jrand48.c6
-rw-r--r--lib/libc/stdlib/l64a.c10
-rw-r--r--lib/libc/stdlib/lcong48.c6
-rw-r--r--lib/libc/stdlib/merge.c10
-rw-r--r--lib/libc/stdlib/multibyte.c8
-rw-r--r--lib/libc/stdlib/nrand48.c6
-rw-r--r--lib/libc/stdlib/putenv.c10
-rw-r--r--lib/libc/stdlib/qsort.c10
-rw-r--r--lib/libc/stdlib/radixsort.c10
-rw-r--r--lib/libc/stdlib/rand_r.c8
-rw-r--r--lib/libc/stdlib/random.c12
-rw-r--r--lib/libc/stdlib/seed48.c6
-rw-r--r--lib/libc/stdlib/setenv.c14
-rw-r--r--lib/libc/stdlib/strtol.c10
-rw-r--r--lib/libc/stdlib/strtoq.c10
-rw-r--r--lib/libc/stdlib/strtoul.c10
-rw-r--r--lib/libc/stdlib/strtouq.c10
-rw-r--r--lib/libc/stdlib/tdelete.c8
-rw-r--r--lib/libc/stdlib/tfind.c8
-rw-r--r--lib/libc/stdlib/tsearch.c8
-rw-r--r--lib/libc/string/__strerror.c8
-rw-r--r--lib/libc/string/__strsignal.c8
-rw-r--r--lib/libc/string/bcmp.c8
-rw-r--r--lib/libc/string/bcopy.c10
-rw-r--r--lib/libc/string/bm.c18
-rw-r--r--lib/libc/string/index.c8
-rw-r--r--lib/libc/string/memccpy.c8
-rw-r--r--lib/libc/string/memchr.c8
-rw-r--r--lib/libc/string/memcmp.c8
-rw-r--r--lib/libc/string/memset.c8
-rw-r--r--lib/libc/string/rindex.c8
-rw-r--r--lib/libc/string/strcasecmp.c8
-rw-r--r--lib/libc/string/strcat.c8
-rw-r--r--lib/libc/string/strcmp.c8
-rw-r--r--lib/libc/string/strcoll.c8
-rw-r--r--lib/libc/string/strcpy.c8
-rw-r--r--lib/libc/string/strcspn.c8
-rw-r--r--lib/libc/string/strdup.c10
-rw-r--r--lib/libc/string/strlcat.c8
-rw-r--r--lib/libc/string/strlcpy.c8
-rw-r--r--lib/libc/string/strlen.c8
-rw-r--r--lib/libc/string/strmode.c8
-rw-r--r--lib/libc/string/strncat.c8
-rw-r--r--lib/libc/string/strncmp.c8
-rw-r--r--lib/libc/string/strncpy.c8
-rw-r--r--lib/libc/string/strpbrk.c8
-rw-r--r--lib/libc/string/strsep.c8
-rw-r--r--lib/libc/string/strspn.c8
-rw-r--r--lib/libc/string/strstr.c8
-rw-r--r--lib/libc/string/strtok.c8
-rw-r--r--lib/libc/string/strtok_r.c8
-rw-r--r--lib/libc/string/strxfrm.c8
-rw-r--r--lib/libc/string/swab.c8
-rw-r--r--lib/libc/termios/cfgetispeed.c8
-rw-r--r--lib/libc/termios/cfgetospeed.c8
-rw-r--r--lib/libc/termios/cfmakeraw.c8
-rw-r--r--lib/libc/termios/cfsetispeed.c8
-rw-r--r--lib/libc/termios/cfsetospeed.c8
-rw-r--r--lib/libc/termios/cfsetspeed.c8
-rw-r--r--lib/libc/termios/tcdrain.c10
-rw-r--r--lib/libc/termios/tcflow.c10
-rw-r--r--lib/libc/termios/tcflush.c10
-rw-r--r--lib/libc/termios/tcgetattr.c14
-rw-r--r--lib/libc/termios/tcgetpgrp.c10
-rw-r--r--lib/libc/termios/tcgetsid.c10
-rw-r--r--lib/libc/termios/tcsendbreak.c10
-rw-r--r--lib/libc/termios/tcsetattr.c14
-rw-r--r--lib/libc/termios/tcsetpgrp.c10
-rw-r--r--lib/libc/yp/xdryp.c108
-rw-r--r--lib/libc/yp/yplib.c8
-rw-r--r--lib/libcompat/4.1/ftime.c8
-rw-r--r--lib/libcompat/4.1/gtty.c12
-rw-r--r--lib/libcompat/4.1/stty.c12
-rw-r--r--lib/libcompat/4.3/insque.c6
-rw-r--r--lib/libcompat/4.3/lsearch.c14
-rw-r--r--lib/libcompat/4.3/regex.c10
-rw-r--r--lib/libcompat/4.3/remque.c6
-rw-r--r--lib/libcompat/4.3/rexec.c8
-rw-r--r--lib/libcompat/4.3/ruserpass.c8
-rw-r--r--lib/libcompat/regexp/regerror.c6
-rw-r--r--lib/librmt/rmtlib.c58
-rw-r--r--lib/libterm/termcap.c20
-rw-r--r--lib/libterm/tputs.c8
-rw-r--r--lib/libusb/data.c10
-rw-r--r--lib/libusb/descr.c8
-rw-r--r--lib/libusb/parse.c22
-rw-r--r--lib/libutil/fparseln.c14
-rw-r--r--lib/libutil/login.c8
-rw-r--r--lib/libutil/login_tty.c10
-rw-r--r--lib/libutil/logout.c8
-rw-r--r--lib/libutil/logwtmp.c8
-rw-r--r--lib/libutil/opendisk.c10
-rw-r--r--lib/libutil/passwd.c8
-rw-r--r--lib/libutil/pidlock.c22
-rw-r--r--lib/libutil/pty.c16
-rw-r--r--lib/libutil/ttyaction.c6
-rw-r--r--lib/libutil/ttymsg.c12
-rw-r--r--lib/liby/yyerror.c6
277 files changed, 520 insertions, 2865 deletions
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
index 6368a90f44e..dc49b7bc7de 100644
--- a/lib/libc/compat-43/creat.c
+++ b/lib/libc/compat-43/creat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: creat.c,v 1.7 1999/09/16 11:44:54 lukem Exp $ */
+/* $NetBSD: creat.c,v 1.8 1999/09/20 04:38:56 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)creat.c 8.1 (Berkeley) 6/2/93";
#else
-__RCSID("$NetBSD: creat.c,v 1.7 1999/09/16 11:44:54 lukem Exp $");
+__RCSID("$NetBSD: creat.c,v 1.8 1999/09/20 04:38:56 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -57,12 +57,6 @@ creat(path, mode)
{
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (-1);
- }
-#endif
return(open(path, O_WRONLY|O_CREAT|O_TRUNC, mode));
}
diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
index 4a896c3ac9d..07028e3b898 100644
--- a/lib/libc/compat-43/getwd.c
+++ b/lib/libc/compat-43/getwd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getwd.c,v 1.10 1999/09/16 11:44:54 lukem Exp $ */
+/* $NetBSD: getwd.c,v 1.11 1999/09/20 04:38:56 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getwd.c 8.1 (Berkeley) 6/2/93";
#else
-__RCSID("$NetBSD: getwd.c,v 1.10 1999/09/16 11:44:54 lukem Exp $");
+__RCSID("$NetBSD: getwd.c,v 1.11 1999/09/20 04:38:56 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,6 @@ getwd(buf)
char *p;
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL)
- return((char *)NULL);
-#endif
if ((p = getcwd(buf, MAXPATHLEN)) != NULL)
return(p);
diff --git a/lib/libc/gen/__fts13.c b/lib/libc/gen/__fts13.c
index 50c26d765dc..a35477bc924 100644
--- a/lib/libc/gen/__fts13.c
+++ b/lib/libc/gen/__fts13.c
@@ -1,4 +1,4 @@
-/* $NetBSD: __fts13.c,v 1.26 1999/09/16 11:44:55 lukem Exp $ */
+/* $NetBSD: __fts13.c,v 1.27 1999/09/20 04:38:57 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
-__RCSID("$NetBSD: __fts13.c,v 1.26 1999/09/16 11:44:55 lukem Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.27 1999/09/20 04:38:57 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -126,13 +126,6 @@ fts_open(argv, options, compar)
size_t len;
_DIAGASSERT(argv != NULL);
-#ifdef _DIAGNOSTIC
- /* compar may be NULL */
- if (argv == NULL) {
- errno = ENOENT;
- return (NULL);
- }
-#endif
/* Options check. */
if (options & ~FTS_OPTIONMASK) {
@@ -267,12 +260,6 @@ fts_close(sp)
int saved_errno = 0;
_DIAGASSERT(sp != NULL);
-#ifdef _DIAGNOSTIC
- if (sp == NULL) {
- errno = EBADF;
- return (-1);
- }
-#endif
/*
* This still works if we haven't read anything -- the dummy structure
@@ -332,12 +319,6 @@ fts_read(sp)
int saved_errno;
_DIAGASSERT(sp != NULL);
-#ifdef _DIAGNOSTIC
- if (sp == NULL) {
- errno = EBADF;
- return (NULL);
- }
-#endif
/* If finished or unrecoverable error, return NULL. */
if (sp->fts_cur == NULL || ISSET(FTS_STOP))
@@ -533,16 +514,6 @@ fts_set(sp, p, instr)
_DIAGASSERT(sp != NULL);
_DIAGASSERT(p != NULL);
-#ifdef _DIAGNOSTIC
- if (sp == NULL) {
- errno = EBADF;
- return (-1);
- }
- if (p == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (instr && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
instr != FTS_NOINSTR && instr != FTS_SKIP) {
@@ -562,12 +533,6 @@ fts_children(sp, instr)
int fd;
_DIAGASSERT(sp != NULL);
-#ifdef _DIAGNOSTIC
- if (sp == NULL) {
- errno = EBADF;
- return (NULL);
- }
-#endif
if (instr && instr != FTS_NAMEONLY) {
errno = EINVAL;
diff --git a/lib/libc/gen/__glob13.c b/lib/libc/gen/__glob13.c
index 7f6477a44d3..fb24ba35f0f 100644
--- a/lib/libc/gen/__glob13.c
+++ b/lib/libc/gen/__glob13.c
@@ -1,4 +1,4 @@
-/* $NetBSD: __glob13.c,v 1.11 1999/09/16 11:44:55 lukem Exp $ */
+/* $NetBSD: __glob13.c,v 1.12 1999/09/20 04:38:57 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
#else
-__RCSID("$NetBSD: __glob13.c,v 1.11 1999/09/16 11:44:55 lukem Exp $");
+__RCSID("$NetBSD: __glob13.c,v 1.12 1999/09/20 04:38:57 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -185,16 +185,6 @@ glob(pattern, flags, errfunc, pglob)
Char *bufnext, *bufend, patbuf[MAXPATHLEN+1];
_DIAGASSERT(pattern != NULL);
-#ifdef _DIAGNOSTIC
- /* errfunc may be NULL */
- _DIAGASSERT(pglob != NULL);
- if (pattern == NULL || pglob == NULL) {
- if (errfunc || (flags & GLOB_ERR))
- return GLOB_ABORTED;
- else
- return GLOB_NOMATCH;
- }
-#endif
patnext = (const u_char *) pattern;
if (!(flags & GLOB_APPEND)) {
@@ -819,10 +809,6 @@ globfree(pglob)
char **pp;
_DIAGASSERT(pglob != NULL);
-#ifdef _DIAGNOSTIC
- if (pglob == NULL)
- return;
-#endif
if (pglob->gl_pathv != NULL) {
pp = pglob->gl_pathv + pglob->gl_offs;
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
index 932ea0e17f1..a92f501b737 100644
--- a/lib/libc/gen/closedir.c
+++ b/lib/libc/gen/closedir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: closedir.c,v 1.8 1999/09/16 11:44:56 lukem Exp $ */
+/* $NetBSD: closedir.c,v 1.9 1999/09/20 04:38:58 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)closedir.c 8.1 (Berkeley) 6/10/93";
#else
-__RCSID("$NetBSD: closedir.c,v 1.8 1999/09/16 11:44:56 lukem Exp $");
+__RCSID("$NetBSD: closedir.c,v 1.9 1999/09/20 04:38:58 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,12 +65,6 @@ closedir(dirp)
int fd;
_DIAGASSERT(dirp != NULL);
-#ifdef _DIAGNOSTIC
- if (dirp == NULL) {
- errno = EBADF;
- return (-1);
- }
-#endif
seekdir(dirp, dirp->dd_rewind); /* free seekdir storage */
fd = dirp->dd_fd;
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 70e348baeb0..075b90a78d2 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.24 1999/09/16 11:44:56 lukem Exp $ */
+/* $NetBSD: disklabel.c,v 1.25 1999/09/20 04:38:58 lukem Exp $ */
/*
* Copyright (c) 1983, 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: disklabel.c,v 1.24 1999/09/16 11:44:56 lukem Exp $");
+__RCSID("$NetBSD: disklabel.c,v 1.25 1999/09/20 04:38:58 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -99,10 +99,6 @@ getdiskbyname(name)
long f;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return NULL;
-#endif
if (cgetent(&buf, db_array, name) < 0)
return NULL;
diff --git a/lib/libc/gen/execvp.c b/lib/libc/gen/execvp.c
index a14043b96b8..2865153cd8b 100644
--- a/lib/libc/gen/execvp.c
+++ b/lib/libc/gen/execvp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: execvp.c,v 1.14 1999/09/16 11:44:56 lukem Exp $ */
+/* $NetBSD: execvp.c,v 1.15 1999/09/20 04:38:58 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: execvp.c,v 1.14 1999/09/16 11:44:56 lukem Exp $");
+__RCSID("$NetBSD: execvp.c,v 1.15 1999/09/20 04:38:58 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -77,13 +77,6 @@ execvp(name, argv)
const char *bp;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- path = NULL;
- goto done;
- }
-#endif
/* "" is not a valid filename; check this before traversing PATH. */
if (name[0] == '\0') {
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index ed677540ae9..31834f998ef 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fnmatch.c,v 1.15 1999/09/16 11:44:56 lukem Exp $ */
+/* $NetBSD: fnmatch.c,v 1.16 1999/09/20 04:38:58 lukem Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: fnmatch.c,v 1.15 1999/09/16 11:44:56 lukem Exp $");
+__RCSID("$NetBSD: fnmatch.c,v 1.16 1999/09/20 04:38:58 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -74,11 +74,6 @@ fnmatch(pattern, string, flags)
_DIAGASSERT(pattern != NULL);
_DIAGASSERT(string != NULL);
-#ifdef _DIAGNOSTIC
- if (pattern == NULL || string == NULL)
- return (FNM_NOMATCH + 1);
- /* per SUS, return non zero but not FNM_NOMATCH */
-#endif
for (stringstart = string;;)
switch (c = *pattern++) {
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index c1938ebbd76..cded4fc2c70 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fstab.c,v 1.20 1999/09/16 11:44:56 lukem Exp $ */
+/* $NetBSD: fstab.c,v 1.21 1999/09/20 04:38:59 lukem Exp $ */
/*
* Copyright (c) 1980, 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fstab.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fstab.c,v 1.20 1999/09/16 11:44:56 lukem Exp $");
+__RCSID("$NetBSD: fstab.c,v 1.21 1999/09/20 04:38:59 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -185,10 +185,6 @@ getfsspec(name)
{
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return NULL;
-#endif
if (setfsent())
while (fstabscan())
@@ -203,10 +199,6 @@ getfsfile(name)
{
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return NULL;
-#endif
if (setfsent())
while (fstabscan())
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
index 72e5d8f49b3..3c736cebf22 100644
--- a/lib/libc/gen/ftok.c
+++ b/lib/libc/gen/ftok.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ftok.c,v 1.7 1999/09/16 11:44:57 lukem Exp $ */
+/* $NetBSD: ftok.c,v 1.8 1999/09/20 04:38:59 lukem Exp $ */
/*
* Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ftok.c,v 1.7 1999/09/16 11:44:57 lukem Exp $");
+__RCSID("$NetBSD: ftok.c,v 1.8 1999/09/20 04:38:59 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -52,12 +52,6 @@ ftok(path, id)
struct stat st;
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (key_t)-1;
- }
-#endif
if (stat(path, &st) < 0)
return (key_t)-1;
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
index a6784ab4b7e..ab0b052d3ce 100644
--- a/lib/libc/gen/getbsize.c
+++ b/lib/libc/gen/getbsize.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getbsize.c,v 1.11 1999/09/16 11:44:57 lukem Exp $ */
+/* $NetBSD: getbsize.c,v 1.12 1999/09/20 04:38:59 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getbsize.c,v 1.11 1999/09/16 11:44:57 lukem Exp $");
+__RCSID("$NetBSD: getbsize.c,v 1.12 1999/09/20 04:38:59 lukem Exp $");
#endif
#endif /* not lint */
@@ -65,10 +65,6 @@ getbsize(headerlenp, blocksizep)
_DIAGASSERT(headerlenp != NULL);
_DIAGASSERT(blocksizep != NULL);
-#ifdef _DIAGNOSTIC
- if (headerlenp == NULL || blocksizep == NULL)
- return (NULL);
-#endif
#define KB (1024L)
#define MB (1024L * 1024L)
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index 82b45d8f409..49898b32f60 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getcap.c,v 1.30 1999/09/16 11:44:57 lukem Exp $ */
+/* $NetBSD: getcap.c,v 1.31 1999/09/20 04:38:59 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94";
#else
-__RCSID("$NetBSD: getcap.c,v 1.30 1999/09/16 11:44:57 lukem Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.31 1999/09/20 04:38:59 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -160,10 +160,6 @@ cgetcap(buf, cap, type)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(cap != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || cap == NULL)
- return (NULL);
-#endif
bp = buf;
for (;;) {
@@ -220,12 +216,6 @@ cgetent(buf, db_array, name)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(db_array != NULL);
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || db_array == NULL || name == NULL) {
- errno = EFAULT;
- return (-2);
- }
-#endif
return (getent(buf, &dummy, db_array, -1, name, 0, NULL));
}
@@ -688,10 +678,6 @@ cgetmatch(buf, name)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || name == NULL)
- return (-1);
-#endif
/*
* Start search at beginning of record.
@@ -732,12 +718,6 @@ cgetfirst(buf, db_array)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(db_array != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || db_array == NULL) {
- errno = EFAULT;
- return (-2);
- }
-#endif
(void)cgetclose();
return (cgetnext(buf, db_array));
@@ -777,12 +757,6 @@ cgetnext(bp, db_array)
_DIAGASSERT(bp != NULL);
_DIAGASSERT(db_array != NULL);
-#ifdef _DIAGNOSTIC
- if (bp == NULL || db_array == NULL) {
- errno = EFAULT;
- return (-2);
- }
-#endif
if (dbp == NULL)
dbp = db_array;
@@ -918,12 +892,6 @@ cgetstr(buf, cap, str)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(cap != NULL);
_DIAGASSERT(str != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || cap == NULL || str == NULL) {
- errno = EFAULT;
- return (-2);
- }
-#endif
/*
* Find string capability cap
@@ -1055,12 +1023,6 @@ cgetustr(buf, cap, str)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(cap != NULL);
_DIAGASSERT(str != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || cap == NULL || str == NULL) {
- errno = EFAULT;
- return (-2);
- }
-#endif
/*
* Find string capability cap
@@ -1135,10 +1097,6 @@ cgetnum(buf, cap, num)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(cap != NULL);
_DIAGASSERT(num != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || cap == NULL || num == NULL)
- return (-1);
-#endif
/*
* Find numeric capability cap
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
index c324445735a..85ced6c9a78 100644
--- a/lib/libc/gen/getcwd.c
+++ b/lib/libc/gen/getcwd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getcwd.c,v 1.22 1999/09/16 11:44:58 lukem Exp $ */
+/* $NetBSD: getcwd.c,v 1.23 1999/09/20 04:38:59 lukem Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95";
#else
-__RCSID("$NetBSD: getcwd.c,v 1.22 1999/09/16 11:44:58 lukem Exp $");
+__RCSID("$NetBSD: getcwd.c,v 1.23 1999/09/20 04:38:59 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -92,16 +92,6 @@ realpath(path, resolved)
_DIAGASSERT(path != NULL);
_DIAGASSERT(resolved != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (NULL);
- }
- if (resolved == NULL) {
- errno = EINVAL;
- return (NULL);
- }
-#endif
/* Save the starting point. */
if ((fd = open(".", O_RDONLY)) < 0) {
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
index 7b05ae25381..0eae3f45347 100644
--- a/lib/libc/gen/getdomainname.c
+++ b/lib/libc/gen/getdomainname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getdomainname.c,v 1.8 1999/09/16 11:44:58 lukem Exp $ */
+/* $NetBSD: getdomainname.c,v 1.9 1999/09/20 04:39:00 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getdomainname.c,v 1.8 1999/09/16 11:44:58 lukem Exp $");
+__RCSID("$NetBSD: getdomainname.c,v 1.9 1999/09/20 04:39:00 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,12 +63,6 @@ getdomainname(name, namelen)
size_t size;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
mib[0] = CTL_KERN;
mib[1] = KERN_DOMAINNAME;
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 615d1fc0488..6f61a93c8f6 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getgrent.c,v 1.37 1999/09/16 11:44:58 lukem Exp $ */
+/* $NetBSD: getgrent.c,v 1.38 1999/09/20 04:39:00 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)getgrent.c 8.2 (Berkeley) 3/21/94";
#else
-__RCSID("$NetBSD: getgrent.c,v 1.37 1999/09/16 11:44:58 lukem Exp $");
+__RCSID("$NetBSD: getgrent.c,v 1.38 1999/09/20 04:39:00 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -131,10 +131,6 @@ getgrnam(name)
int rval;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return (NULL);
-#endif
if (!start_gr())
return NULL;
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
index 246558f79c3..2b8b41099cb 100644
--- a/lib/libc/gen/getgrouplist.c
+++ b/lib/libc/gen/getgrouplist.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getgrouplist.c,v 1.13 1999/09/16 11:44:58 lukem Exp $ */
+/* $NetBSD: getgrouplist.c,v 1.14 1999/09/20 04:39:00 lukem Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94";
#else
-__RCSID("$NetBSD: getgrouplist.c,v 1.13 1999/09/16 11:44:58 lukem Exp $");
+__RCSID("$NetBSD: getgrouplist.c,v 1.14 1999/09/20 04:39:00 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,10 +71,6 @@ getgrouplist(uname, agroup, groups, grpcnt)
_DIAGASSERT(uname != NULL);
_DIAGASSERT(groups != NULL);
_DIAGASSERT(grpcnt != NULL);
-#ifdef _DIAGNOSTIC
- if (uname == NULL || groups == NULL || grpcnt == NULL)
- return (-1);
-#endif
ret = 0;
ngroups = 0;
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
index 2ba22dd3546..4c2e424bd9e 100644
--- a/lib/libc/gen/gethostname.c
+++ b/lib/libc/gen/gethostname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gethostname.c,v 1.7 1999/09/16 11:44:59 lukem Exp $ */
+/* $NetBSD: gethostname.c,v 1.8 1999/09/20 04:39:01 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)gethostname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: gethostname.c,v 1.7 1999/09/16 11:44:59 lukem Exp $");
+__RCSID("$NetBSD: gethostname.c,v 1.8 1999/09/20 04:39:01 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,12 +63,6 @@ gethostname(name, namelen)
size_t size;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
mib[0] = CTL_KERN;
mib[1] = KERN_HOSTNAME;
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
index 2c2af6b8f7e..8f364968a25 100644
--- a/lib/libc/gen/getloadavg.c
+++ b/lib/libc/gen/getloadavg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getloadavg.c,v 1.8 1999/09/16 11:44:59 lukem Exp $ */
+/* $NetBSD: getloadavg.c,v 1.9 1999/09/20 04:39:01 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getloadavg.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getloadavg.c,v 1.8 1999/09/16 11:44:59 lukem Exp $");
+__RCSID("$NetBSD: getloadavg.c,v 1.9 1999/09/20 04:39:01 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -73,12 +73,6 @@ getloadavg(loadavg, nelem)
size_t size;
_DIAGASSERT(loadavg != NULL);
-#ifdef _DIAGNOSTIC
- if (loadavg == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
mib[0] = CTL_VM;
mib[1] = VM_LOADAVG;
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index ac4756755d5..ec2e00c6a62 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getmntinfo.c,v 1.9 1999/09/16 11:44:59 lukem Exp $ */
+/* $NetBSD: getmntinfo.c,v 1.10 1999/09/20 04:39:01 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getmntinfo.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getmntinfo.c,v 1.9 1999/09/16 11:44:59 lukem Exp $");
+__RCSID("$NetBSD: getmntinfo.c,v 1.10 1999/09/20 04:39:01 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -68,12 +68,6 @@ getmntinfo(mntbufp, flags)
static size_t bufsize;
_DIAGASSERT(mntbufp != NULL);
-#ifdef _DIAGNOSTIC
- if (mntbufp == NULL) {
- errno = EFAULT;
- return (0);
- }
-#endif
if (mntsize <= 0 &&
(mntsize = getfsstat(NULL, 0L, MNT_NOWAIT)) < 0)
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index f8e6df5c49e..b4ee744180b 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getnetgrent.c,v 1.24 1999/09/16 11:44:59 lukem Exp $ */
+/* $NetBSD: getnetgrent.c,v 1.25 1999/09/20 04:39:01 lukem Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getnetgrent.c,v 1.24 1999/09/16 11:44:59 lukem Exp $");
+__RCSID("$NetBSD: getnetgrent.c,v 1.25 1999/09/20 04:39:01 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -356,10 +356,6 @@ _ng_parse(p, name, ng)
_DIAGASSERT(*p != NULL);
_DIAGASSERT(name != NULL);
_DIAGASSERT(ng != NULL);
-#ifdef _DIAGNOSTIC
- if (p == NULL || *p == NULL || name == NULL || ng == NULL)
- return _NG_NONE;
-#endif
while (**p) {
if (**p == '#')
@@ -610,10 +606,6 @@ _ng_print(buf, len, ng)
{
_DIAGASSERT(buf != NULL);
_DIAGASSERT(ng != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || ng == NULL)
- return;
-#endif
(void) snprintf(buf, len, "(%s,%s,%s)", _NG_EMPTY(ng->ng_host),
_NG_EMPTY(ng->ng_user), _NG_EMPTY(ng->ng_domain));
@@ -726,10 +718,6 @@ setnetgrent(ng)
char *ng_copy;
_DIAGASSERT(ng != NULL);
-#ifdef _DIAGNOSTIC
- if (ng == NULL)
- return;
-#endif
/* Cleanup any previous storage */
if (_nghead != NULL)
@@ -756,10 +744,6 @@ getnetgrent(host, user, domain)
_DIAGASSERT(host != NULL);
_DIAGASSERT(user != NULL);
_DIAGASSERT(domain != NULL);
-#ifdef _DIAGNOSTIC
- if (host == NULL || user == NULL || domain == NULL)
- return 0;
-#endif
if (_nglist == NULL)
return 0;
@@ -785,10 +769,6 @@ innetgr(grp, host, user, domain)
/* host may be NULL */
/* user may be NULL */
/* domain may be NULL */
-#ifdef _DIAGNOSTIC
- if (grp == NULL)
- return 0;
-#endif
if (_ng_db == NULL)
_ng_db = dbopen(_PATH_NETGROUP_DB, O_RDONLY, 0, DB_HASH, NULL);
diff --git a/lib/libc/gen/getsubopt.c b/lib/libc/gen/getsubopt.c
index f75669396d0..d84997165a8 100644
--- a/lib/libc/gen/getsubopt.c
+++ b/lib/libc/gen/getsubopt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getsubopt.c,v 1.9 1999/09/16 11:45:00 lukem Exp $ */
+/* $NetBSD: getsubopt.c,v 1.10 1999/09/20 04:39:02 lukem Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
#if 0
static char *sccsid = "@(#)getsubopt.c 5.2 (Berkeley) 2/24/91";
#else
-__RCSID("$NetBSD: getsubopt.c,v 1.9 1999/09/16 11:45:00 lukem Exp $");
+__RCSID("$NetBSD: getsubopt.c,v 1.10 1999/09/20 04:39:02 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,10 +72,6 @@ getsubopt(optionp, tokens, valuep)
_DIAGASSERT(optionp != NULL);
_DIAGASSERT(tokens != NULL);
_DIAGASSERT(valuep != NULL);
-#ifdef _DIAGNOSTIC
- if (tokens == NULL || valuep == NULL)
- return (-1);
-#endif
suboptarg = *valuep = NULL;
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index 89977f25e3a..96a5a60da31 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getttyent.c,v 1.15 1999/09/16 11:45:00 lukem Exp $ */
+/* $NetBSD: getttyent.c,v 1.16 1999/09/20 04:39:02 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getttyent.c,v 1.15 1999/09/16 11:45:00 lukem Exp $");
+__RCSID("$NetBSD: getttyent.c,v 1.16 1999/09/20 04:39:02 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,10 +69,6 @@ getttynam(tty)
struct ttyent *t;
_DIAGASSERT(tty != NULL);
-#ifdef _DIAGNOSTIC
- if (tty == NULL)
- return (NULL);
-#endif
setttyent();
while ((t = getttyent()) != NULL)
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index e1f73e5b641..d2d9aaa3d9f 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -1,4 +1,4 @@
-/* $NetBSD: initgroups.c,v 1.17 1999/09/16 11:45:00 lukem Exp $ */
+/* $NetBSD: initgroups.c,v 1.18 1999/09/20 04:39:02 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)initgroups.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: initgroups.c,v 1.17 1999/09/16 11:45:00 lukem Exp $");
+__RCSID("$NetBSD: initgroups.c,v 1.18 1999/09/20 04:39:02 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,10 +62,6 @@ initgroups(uname, agroup)
int ngroups;
_DIAGASSERT(uname != NULL);
-#ifdef _DIAGNOSTIC
- if (uname == NULL)
- return (-1);
-#endif
ngroups = NGROUPS;
getgrouplist(uname, agroup, groups, &ngroups);
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
index 5567675ab2b..4e33368044d 100644
--- a/lib/libc/gen/isatty.c
+++ b/lib/libc/gen/isatty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isatty.c,v 1.8 1999/09/16 11:45:01 lukem Exp $ */
+/* $NetBSD: isatty.c,v 1.9 1999/09/20 04:39:02 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)isatty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: isatty.c,v 1.8 1999/09/16 11:45:01 lukem Exp $");
+__RCSID("$NetBSD: isatty.c,v 1.9 1999/09/20 04:39:02 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,11 +60,5 @@ isatty(fd)
struct termios t;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
return(tcgetattr(fd, &t) != -1);
}
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 539f896a448..460f9ff8834 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist.c,v 1.14 1999/09/16 11:45:01 lukem Exp $ */
+/* $NetBSD: nlist.c,v 1.15 1999/09/20 04:39:02 lukem Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: nlist.c,v 1.14 1999/09/16 11:45:01 lukem Exp $");
+__RCSID("$NetBSD: nlist.c,v 1.15 1999/09/20 04:39:02 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -88,12 +88,6 @@ nlist(name, list)
_DIAGASSERT(name != NULL);
_DIAGASSERT(list != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || list == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
fd = open(name, O_RDONLY, 0);
if (fd < 0)
@@ -112,16 +106,6 @@ __fdnlist(fd, list)
_DIAGASSERT(fd != -1);
_DIAGASSERT(list != NULL);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
- if (list == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
for (i = 0; i < sizeof(fdnlist_fmts) / sizeof(fdnlist_fmts[0]); i++)
if ((rv = (*fdnlist_fmts[i].fdnlist)(fd, list)) != -1)
diff --git a/lib/libc/gen/nlist_aout.c b/lib/libc/gen/nlist_aout.c
index f6d28ddf8b4..5accd784f5e 100644
--- a/lib/libc/gen/nlist_aout.c
+++ b/lib/libc/gen/nlist_aout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_aout.c,v 1.10 1999/09/16 11:45:01 lukem Exp $ */
+/* $NetBSD: nlist_aout.c,v 1.11 1999/09/20 04:39:03 lukem Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: nlist_aout.c,v 1.10 1999/09/16 11:45:01 lukem Exp $");
+__RCSID("$NetBSD: nlist_aout.c,v 1.11 1999/09/20 04:39:03 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -75,16 +75,6 @@ __fdnlist_aout(fd, list)
_DIAGASSERT(fd != -1);
_DIAGASSERT(list != NULL);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
- if (list == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (pread(fd, &exec, sizeof(exec), (off_t)0) != sizeof(exec) ||
N_BADMAG(exec) || fstat(fd, &st) < 0)
diff --git a/lib/libc/gen/nlist_ecoff.c b/lib/libc/gen/nlist_ecoff.c
index 4e6c7ef0800..05f35aa3790 100644
--- a/lib/libc/gen/nlist_ecoff.c
+++ b/lib/libc/gen/nlist_ecoff.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_ecoff.c,v 1.9 1999/09/16 11:45:01 lukem Exp $ */
+/* $NetBSD: nlist_ecoff.c,v 1.10 1999/09/20 04:39:03 lukem Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nlist_ecoff.c,v 1.9 1999/09/16 11:45:01 lukem Exp $");
+__RCSID("$NetBSD: nlist_ecoff.c,v 1.10 1999/09/20 04:39:03 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -77,16 +77,6 @@ __fdnlist_ecoff(fd, list)
_DIAGASSERT(fd != -1);
_DIAGASSERT(list != NULL);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
- if (list == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
rv = -1;
diff --git a/lib/libc/gen/nlist_elf32.c b/lib/libc/gen/nlist_elf32.c
index c030cb70e97..d92a14562e8 100644
--- a/lib/libc/gen/nlist_elf32.c
+++ b/lib/libc/gen/nlist_elf32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nlist_elf32.c,v 1.14 1999/09/16 11:45:01 lukem Exp $ */
+/* $NetBSD: nlist_elf32.c,v 1.15 1999/09/20 04:39:03 lukem Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -91,16 +91,6 @@ ELFNAMEEND(__fdnlist)(fd, list)
_DIAGASSERT(fd != -1);
_DIAGASSERT(list != NULL);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
- if (list == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
rv = -1;
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index a884431a1b1..6ea47fbf9ea 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opendir.c,v 1.18 1999/09/16 11:45:02 lukem Exp $ */
+/* $NetBSD: opendir.c,v 1.19 1999/09/20 04:39:03 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)opendir.c 8.7 (Berkeley) 12/10/94";
#else
-__RCSID("$NetBSD: opendir.c,v 1.18 1999/09/16 11:45:02 lukem Exp $");
+__RCSID("$NetBSD: opendir.c,v 1.19 1999/09/20 04:39:03 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -68,12 +68,6 @@ opendir(name)
{
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || *name == '\0') {
- errno = ENOENT;
- return (NULL);
- }
-#endif
return (__opendir2(name, DTF_HIDEW|DTF_NODUP));
}
@@ -92,10 +86,6 @@ __opendir2(name, flags)
struct statfs sfb;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || *name == '\0')
- return (NULL);
-#endif
if ((fd = open(name, O_RDONLY | O_NONBLOCK)) == -1)
return (NULL);
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index 31e0ea26d8d..6d266baf428 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: popen.c,v 1.23 1999/09/16 11:45:02 lukem Exp $ */
+/* $NetBSD: popen.c,v 1.24 1999/09/20 04:39:03 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: popen.c,v 1.23 1999/09/16 11:45:02 lukem Exp $");
+__RCSID("$NetBSD: popen.c,v 1.24 1999/09/20 04:39:03 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -80,12 +80,6 @@ popen(command, type)
_DIAGASSERT(command != NULL);
_DIAGASSERT(type != NULL);
-#ifdef _DIAGNOSTIC
- if (command == NULL || type == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
#ifdef __GNUC__
/* This outrageous construct just to shut up a GCC warning. */
@@ -182,12 +176,6 @@ pclose(iop)
pid_t pid;
_DIAGASSERT(iop != NULL);
-#ifdef _DIAGNOSTIC
- if (iop == NULL) {
- errno = EBADF;
- return (-1);
- }
-#endif
/* Find the appropriate file pointer. */
for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next)
diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index ec8fdac74ba..8c9dea6c54d 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pw_scan.c,v 1.9 1999/09/16 11:45:02 lukem Exp $ */
+/* $NetBSD: pw_scan.c,v 1.10 1999/09/20 04:39:04 lukem Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pw_scan.c,v 1.9 1999/09/16 11:45:02 lukem Exp $");
+__RCSID("$NetBSD: pw_scan.c,v 1.10 1999/09/20 04:39:04 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#if defined(_LIBC)
@@ -73,10 +73,6 @@ pw_scan(bp, pw, flags)
_DIAGASSERT(bp != NULL);
_DIAGASSERT(pw != NULL);
-#ifdef _DIAGNOSTIC
- if (bp == NULL || pw == NULL)
- return (0);
-#endif
inflags = 0;
if (flags != (int *)NULL) {
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index d3d1d9a09c1..757c29c2454 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: readdir.c,v 1.13 1999/09/16 11:45:03 lukem Exp $ */
+/* $NetBSD: readdir.c,v 1.14 1999/09/20 04:39:04 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)readdir.c 8.3 (Berkeley) 9/29/94";
#else
-__RCSID("$NetBSD: readdir.c,v 1.13 1999/09/16 11:45:03 lukem Exp $");
+__RCSID("$NetBSD: readdir.c,v 1.14 1999/09/20 04:39:04 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ readdir(dirp)
{
struct dirent *dp;
-#ifdef _DIAGNOSTIC
- if (dirp == NULL) {
- errno = EBADF;
- return (NULL);
- }
-#endif
for (;;) {
if (dirp->dd_loc >= dirp->dd_size) {
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 845992c5819..35d45a6c190 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rewinddir.c,v 1.7 1999/09/16 11:45:03 lukem Exp $ */
+/* $NetBSD: rewinddir.c,v 1.8 1999/09/20 04:39:04 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)rewinddir.c 8.1 (Berkeley) 6/8/93";
#else
-__RCSID("$NetBSD: rewinddir.c,v 1.7 1999/09/16 11:45:03 lukem Exp $");
+__RCSID("$NetBSD: rewinddir.c,v 1.8 1999/09/20 04:39:04 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,10 +56,6 @@ rewinddir(dirp)
DIR *dirp;
{
-#ifdef _DIAGNOSTIC
- if (dirp == NULL)
- return;
-#endif
__seekdir(dirp, dirp->dd_rewind);
dirp->dd_rewind = telldir(dirp);
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index fadc3883e53..15d170b270c 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scandir.c,v 1.15 1999/09/16 11:45:03 lukem Exp $ */
+/* $NetBSD: scandir.c,v 1.16 1999/09/20 04:39:04 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)scandir.c 8.3 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: scandir.c,v 1.15 1999/09/16 11:45:03 lukem Exp $");
+__RCSID("$NetBSD: scandir.c,v 1.16 1999/09/20 04:39:04 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -89,12 +89,6 @@ scandir(dirname, namelist, select, dcomp)
_DIAGASSERT(dirname != NULL);
_DIAGASSERT(namelist != NULL);
-#ifdef _DIAGNOSTIC
- if (dirname == NULL || namelist == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if ((dirp = opendir(dirname)) == NULL)
return(-1);
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index df6f86d2ee3..5d615c0bd20 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: seekdir.c,v 1.7 1999/09/16 11:45:04 lukem Exp $ */
+/* $NetBSD: seekdir.c,v 1.8 1999/09/20 04:39:05 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)seekdir.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: seekdir.c,v 1.7 1999/09/16 11:45:04 lukem Exp $");
+__RCSID("$NetBSD: seekdir.c,v 1.8 1999/09/20 04:39:05 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,10 +61,6 @@ seekdir(dirp, loc)
long loc;
{
-#ifdef _DIAGNOSTIC
- if (dirp == NULL)
- return;
-#endif
__seekdir(dirp, loc);
}
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
index fa78ae35f3a..9284885f9b2 100644
--- a/lib/libc/gen/setdomainname.c
+++ b/lib/libc/gen/setdomainname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setdomainname.c,v 1.9 1999/09/16 11:45:04 lukem Exp $ */
+/* $NetBSD: setdomainname.c,v 1.10 1999/09/20 04:39:05 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)sethostname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: setdomainname.c,v 1.9 1999/09/16 11:45:04 lukem Exp $");
+__RCSID("$NetBSD: setdomainname.c,v 1.10 1999/09/20 04:39:05 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ setdomainname(name, namelen)
int mib[2];
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
mib[0] = CTL_KERN;
mib[1] = KERN_DOMAINNAME;
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
index b8a12cb24dd..639315f1351 100644
--- a/lib/libc/gen/sethostname.c
+++ b/lib/libc/gen/sethostname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sethostname.c,v 1.9 1999/09/16 11:45:04 lukem Exp $ */
+/* $NetBSD: sethostname.c,v 1.10 1999/09/20 04:39:05 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)sethostname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: sethostname.c,v 1.9 1999/09/16 11:45:04 lukem Exp $");
+__RCSID("$NetBSD: sethostname.c,v 1.10 1999/09/20 04:39:05 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ sethostname(name, namelen)
int mib[2];
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
mib[0] = CTL_KERN;
mib[1] = KERN_HOSTNAME;
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index 78ba88801ae..6ae62decb0b 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setmode.c,v 1.22 1999/09/16 11:45:04 lukem Exp $ */
+/* $NetBSD: setmode.c,v 1.23 1999/09/20 04:39:05 lukem Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94";
#else
-__RCSID("$NetBSD: setmode.c,v 1.22 1999/09/16 11:45:04 lukem Exp $");
+__RCSID("$NetBSD: setmode.c,v 1.23 1999/09/20 04:39:05 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -101,10 +101,6 @@ getmode(bbox, omode)
mode_t clrval, newmode, value;
_DIAGASSERT(bbox != NULL);
-#ifdef _DIAGNOSTIC
- if (bbox == NULL)
- return (omode);
-#endif
set = (const BITCMD *)bbox;
newmode = omode;
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index a6ee6e668d1..5de6e634dba 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.9 1999/09/16 11:45:05 lukem Exp $ */
+/* $NetBSD: sysctl.c,v 1.10 1999/09/20 04:39:05 lukem Exp $ */
/*-
* Copyright (c) 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)sysctl.c 8.2 (Berkeley) 1/4/94";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.9 1999/09/16 11:45:05 lukem Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.10 1999/09/20 04:39:05 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,12 +69,6 @@ sysctl(name, namelen, oldp, oldlenp, newp, newlen)
{
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (name[0] != CTL_USER)
/* LINTED will fix when sysctl interface gets corrected */
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index 1a05579980a..9d4db5710f1 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: telldir.c,v 1.10 1999/09/16 11:45:05 lukem Exp $ */
+/* $NetBSD: telldir.c,v 1.11 1999/09/20 04:39:06 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)telldir.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: telldir.c,v 1.10 1999/09/16 11:45:05 lukem Exp $");
+__RCSID("$NetBSD: telldir.c,v 1.11 1999/09/20 04:39:06 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -90,10 +90,6 @@ telldir(dirp)
long index;
struct ddloc *lp;
-#ifdef _DIAGNOSTIC
- if (dirp == NULL)
- return (-1);
-#endif
if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL)
return (-1);
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
index eb6f8c33961..cc08c7ea56e 100644
--- a/lib/libc/gen/times.c
+++ b/lib/libc/gen/times.c
@@ -1,4 +1,4 @@
-/* $NetBSD: times.c,v 1.9 1999/09/16 11:45:05 lukem Exp $ */
+/* $NetBSD: times.c,v 1.10 1999/09/20 04:39:06 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)times.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: times.c,v 1.9 1999/09/16 11:45:05 lukem Exp $");
+__RCSID("$NetBSD: times.c,v 1.10 1999/09/20 04:39:06 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,12 +70,6 @@ times(tp)
struct timeval t;
_DIAGASSERT(tp != NULL);
-#ifdef _DIAGNOSTIC
- if (tp == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (getrusage(RUSAGE_SELF, &ru) < 0)
return ((clock_t)-1);
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index 4a596685c91..80be0b64e74 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttyname.c,v 1.16 1999/09/16 11:45:06 lukem Exp $ */
+/* $NetBSD: ttyname.c,v 1.17 1999/09/20 04:39:06 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ttyname.c 8.2 (Berkeley) 1/27/94";
#else
-__RCSID("$NetBSD: ttyname.c,v 1.16 1999/09/16 11:45:06 lukem Exp $");
+__RCSID("$NetBSD: ttyname.c,v 1.17 1999/09/20 04:39:06 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -77,12 +77,6 @@ ttyname(fd)
} bkey;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (NULL);
- }
-#endif
/* Must be a terminal. */
if (tcgetattr(fd, &ttyb) < 0)
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
index e930a436670..f8dce6c38c9 100644
--- a/lib/libc/gen/uname.c
+++ b/lib/libc/gen/uname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uname.c,v 1.6 1999/09/16 11:45:06 lukem Exp $ */
+/* $NetBSD: uname.c,v 1.7 1999/09/20 04:39:06 lukem Exp $ */
/*-
* Copyright (c) 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)uname.c 8.1 (Berkeley) 1/4/94";
#else
-__RCSID("$NetBSD: uname.c,v 1.6 1999/09/16 11:45:06 lukem Exp $");
+__RCSID("$NetBSD: uname.c,v 1.7 1999/09/20 04:39:06 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,12 +65,6 @@ uname(name)
rval = 0;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
mib[0] = CTL_KERN;
mib[1] = KERN_OSTYPE;
diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c
index 80765d7b96f..c90db3973c8 100644
--- a/lib/libc/gen/unvis.c
+++ b/lib/libc/gen/unvis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: unvis.c,v 1.15 1999/09/16 11:45:06 lukem Exp $ */
+/* $NetBSD: unvis.c,v 1.16 1999/09/20 04:39:06 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: unvis.c,v 1.15 1999/09/16 11:45:06 lukem Exp $");
+__RCSID("$NetBSD: unvis.c,v 1.16 1999/09/20 04:39:06 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -94,10 +94,6 @@ __unvis13(cp, c, astate, flag)
_DIAGASSERT(cp != NULL);
_DIAGASSERT(astate != NULL);
-#ifdef _DIAGNOSTIC
- if (cp == NULL || astate == NULL)
- return (UNVIS_SYNBAD);
-#endif
if (flag & UNVIS_END) {
if (*astate == S_OCTAL2 || *astate == S_OCTAL3) {
@@ -265,10 +261,6 @@ strunvis(dst, src)
_DIAGASSERT(src != NULL);
_DIAGASSERT(dst != NULL);
-#ifdef _DIAGNOSTIC
- if (src == NULL || dst == NULL)
- return (-1);
-#endif
while ((c = *src++) != '\0') {
again:
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
index d19b08c0846..77a62d5630c 100644
--- a/lib/libc/gen/utime.c
+++ b/lib/libc/gen/utime.c
@@ -1,4 +1,4 @@
-/* $NetBSD: utime.c,v 1.9 1999/09/16 11:45:06 lukem Exp $ */
+/* $NetBSD: utime.c,v 1.10 1999/09/20 04:39:06 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)utime.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: utime.c,v 1.9 1999/09/16 11:45:06 lukem Exp $");
+__RCSID("$NetBSD: utime.c,v 1.10 1999/09/20 04:39:06 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ utime(path, times)
struct timeval tv[2], *tvp;
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (NULL);
- }
-#endif
if (times == (struct utimbuf *) NULL)
tvp = NULL;
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
index f5fa4418f1e..d8ad60d479b 100644
--- a/lib/libc/gen/vis.c
+++ b/lib/libc/gen/vis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.12 1999/09/16 11:45:07 lukem Exp $ */
+/* $NetBSD: vis.c,v 1.13 1999/09/20 04:39:07 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 7/19/93";
#else
-__RCSID("$NetBSD: vis.c,v 1.12 1999/09/16 11:45:07 lukem Exp $");
+__RCSID("$NetBSD: vis.c,v 1.13 1999/09/20 04:39:07 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,10 +70,6 @@ vis(dst, c, flag, nextc)
{
_DIAGASSERT(dst != NULL);
-#ifdef _DIAGNOSTIC
- if (dst == NULL)
- return (NULL);
-#endif
if (((u_int)c <= UCHAR_MAX && isascii(c) && isgraph(c)) ||
((flag & VIS_SP) == 0 && c == ' ') ||
@@ -184,10 +180,6 @@ strvis(dst, src, flag)
_DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL);
-#ifdef _DIAGNOSTIC
- if (dst == NULL || src == NULL)
- return (0);
-#endif
for (start = dst; (c = *src) != '\0';)
dst = vis(dst, c, flag, *++src);
@@ -207,10 +199,6 @@ strvisx(dst, src, len, flag)
_DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL);
-#ifdef _DIAGNOSTIC
- if (dst == NULL || src == NULL)
- return (0);
-#endif
for (start = dst; len > 1; len--) {
c = *src;
diff --git a/lib/libc/hash/sha1.c b/lib/libc/hash/sha1.c
index ca31ad4257d..95351cc8122 100644
--- a/lib/libc/hash/sha1.c
+++ b/lib/libc/hash/sha1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sha1.c,v 1.3 1999/09/16 11:45:07 lukem Exp $ */
+/* $NetBSD: sha1.c,v 1.4 1999/09/20 04:39:07 lukem Exp $ */
/* $OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $ */
/*
@@ -91,10 +91,6 @@ void SHA1Transform(state, buffer)
_DIAGASSERT(buffer != 0);
_DIAGASSERT(state != 0);
-#ifdef _DIAGNOSTIC
- if (buffer == 0 || state == 0)
- return;
-#endif
#ifdef SHA1HANDSOFF
block = (CHAR64LONG16 *)(void *)workspace;
@@ -152,10 +148,6 @@ void SHA1Init(context)
{
_DIAGASSERT(context != 0);
-#ifdef _DIAGNOSTIC
- if (context == 0)
- return;
-#endif
/* SHA1 initialization constants */
context->state[0] = 0x67452301;
@@ -179,10 +171,6 @@ void SHA1Update(context, data, len)
_DIAGASSERT(context != 0);
_DIAGASSERT(data != 0);
-#ifdef _DIAGNOSTIC
- if (context == 0 || data == 0)
- return;
-#endif
j = context->count[0];
if ((context->count[0] += len << 3) < j)
@@ -213,10 +201,6 @@ void SHA1Final(digest, context)
_DIAGASSERT(digest != 0);
_DIAGASSERT(context != 0);
-#ifdef _DIAGNOSTIC
- if (digest == 0 || context == 0)
- return;
-#endif
for (i = 0; i < 8; i++) {
finalcount[i] = (u_char)((context->count[(i >= 4 ? 0 : 1)]
diff --git a/lib/libc/hash/sha1hl.c b/lib/libc/hash/sha1hl.c
index 2b6d16fbb18..620bed0025f 100644
--- a/lib/libc/hash/sha1hl.c
+++ b/lib/libc/hash/sha1hl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sha1hl.c,v 1.3 1999/09/16 11:45:07 lukem Exp $ */
+/* $NetBSD: sha1hl.c,v 1.4 1999/09/20 04:39:07 lukem Exp $ */
/* sha1hl.c
* ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42):
@@ -23,7 +23,7 @@
#include <unistd.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha1hl.c,v 1.3 1999/09/16 11:45:07 lukem Exp $");
+__RCSID("$NetBSD: sha1hl.c,v 1.4 1999/09/20 04:39:07 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#if defined(__weak_alias)
@@ -45,10 +45,6 @@ SHA1End(ctx, buf)
_DIAGASSERT(ctx != NULL);
/* buf may be NULL */
-#ifdef _DIAGNOSTIC
- if (ctx == NULL)
- return NULL;
-#endif
if (p == NULL && (p = malloc(41)) == NULL)
return 0;
@@ -73,10 +69,6 @@ SHA1File (filename, buf)
_DIAGASSERT(filename != NULL);
/* XXX: buf may be NULL ? */
-#ifdef _DIAGNOSTIC
- if (filename == NULL || *filename == '\0')
- return(0);
-#endif
SHA1Init(&ctx);
@@ -102,10 +94,6 @@ SHA1Data (data, len, buf)
_DIAGASSERT(data != NULL);
/* XXX: buf may be NULL ? */
-#ifdef _DIAGNOSTIC
- if (data == NULL)
- return NULL;
-#endif
SHA1Init(&ctx);
SHA1Update(&ctx, data, len);
diff --git a/lib/libc/locale/ctypeio.c b/lib/libc/locale/ctypeio.c
index 23c791450cb..70abb9197bf 100644
--- a/lib/libc/locale/ctypeio.c
+++ b/lib/libc/locale/ctypeio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ctypeio.c,v 1.3 1999/09/16 11:45:08 lukem Exp $ */
+/* $NetBSD: ctypeio.c,v 1.4 1999/09/20 04:39:08 lukem Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -49,10 +49,6 @@ __loadctype(name)
short *new_toupper = NULL, *new_tolower = NULL;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || *name == '\0')
- return 0;
-#endif
if ((fp = fopen(name, "r")) == NULL)
return 0;
@@ -142,11 +138,6 @@ __savectype(name, new_ctype, new_toupper, new_tolower)
_DIAGASSERT(new_ctype != NULL);
_DIAGASSERT(new_toupper != NULL);
_DIAGASSERT(new_tolower != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || *name == '\0' || new_ctype == NULL ||
- new_toupper == NULL || new_tolower == NULL)
- return 0;
-#endif
if ((fp = fopen(name, "w")) == NULL)
return 0;
diff --git a/lib/libc/md/md4c.c b/lib/libc/md/md4c.c
index 88b5056e3a8..e803bd78855 100644
--- a/lib/libc/md/md4c.c
+++ b/lib/libc/md/md4c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md4c.c,v 1.7 1999/09/17 09:25:34 kleink Exp $ */
+/* $NetBSD: md4c.c,v 1.8 1999/09/20 04:39:08 lukem Exp $ */
/*
* This file is derived from the RSA Data Security, Inc. MD4 Message-Digest
@@ -113,10 +113,6 @@ MD4Init(context)
{
_DIAGASSERT(context != 0);
-#ifdef _DIAGNOSTIC
- if (context == 0)
- return;
-#endif
context->count[0] = context->count[1] = 0;
@@ -142,10 +138,6 @@ MD4Update (context, input, inputLen)
_DIAGASSERT(context != 0);
_DIAGASSERT(input != 0);
-#ifdef _DIAGNOSTIC
- if (context == 0 || input == 0)
- return;
-#endif
/* Compute number of bytes mod 64 */
idx = (unsigned int)((context->count[0] >> 3) & 0x3F);
@@ -188,10 +180,6 @@ MD4Final (digest, context)
_DIAGASSERT(digest != 0);
_DIAGASSERT(context != 0);
-#ifdef _DIAGNOSTIC
- if (digest == 0 || context == 0)
- return;
-#endif
/* Save number of bits */
Encode(bits, context->count, 8);
diff --git a/lib/libc/md/md5c.c b/lib/libc/md/md5c.c
index b2614538c4c..6e40a30e2c0 100644
--- a/lib/libc/md/md5c.c
+++ b/lib/libc/md/md5c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md5c.c,v 1.14 1999/09/17 09:25:34 kleink Exp $ */
+/* $NetBSD: md5c.c,v 1.15 1999/09/20 04:39:10 lukem Exp $ */
/*
* This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
@@ -172,10 +172,6 @@ MD5Init(context)
{
_DIAGASSERT(context != 0);
-#ifdef _DIAGNOSTIC
- if (context == 0)
- return;
-#endif
context->count[0] = context->count[1] = 0;
@@ -201,10 +197,6 @@ MD5Update(context, input, inputLen)
_DIAGASSERT(context != 0);
_DIAGASSERT(input != 0);
-#ifdef _DIAGNOSTIC
- if (context == 0 || input == 0)
- return;
-#endif
/* Compute number of bytes mod 64 */
idx = (unsigned int)((context->count[0] >> 3) & 0x3F);
@@ -251,10 +243,6 @@ MD5Final(digest, context)
_DIAGASSERT(digest != 0);
_DIAGASSERT(context != 0);
-#ifdef _DIAGNOSTIC
- if (digest == 0 || context == 0)
- return;
-#endif
/* Save number of bits */
Encode(bits, context->count, 8);
diff --git a/lib/libc/md/mdXhl.c b/lib/libc/md/mdXhl.c
index e531279e4a6..3a8b039dd54 100644
--- a/lib/libc/md/mdXhl.c
+++ b/lib/libc/md/mdXhl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mdXhl.c,v 1.4 1999/09/16 11:45:10 lukem Exp $ */
+/* $NetBSD: mdXhl.c,v 1.5 1999/09/20 04:39:10 lukem Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -37,10 +37,6 @@ MDNAME(End)(ctx, buf)
static const char hex[]="0123456789abcdef";
_DIAGASSERT(ctx != 0);
-#ifdef _DIAGNOSTIC
- if (ctx == 0)
- return (NULL);
-#endif
if (buf == NULL)
buf = malloc(33);
@@ -69,10 +65,6 @@ MDNAME(File)(filename, buf)
_DIAGASSERT(filename != 0);
/* buf may be NULL */
-#ifdef _DIAGNOSTIC
- if (filename == 0 || *filename == '\0')
- return (NULL);
-#endif
MDNAME(Init)(&ctx);
f = open(filename, O_RDONLY, 0666);
@@ -101,10 +93,6 @@ MDNAME(Data)(data, len, buf)
MDNAME(_CTX) ctx;
_DIAGASSERT(data != 0);
-#ifdef _DIAGNOSTIC
- if (data == 0)
- return (NULL);
-#endif
MDNAME(Init)(&ctx);
MDNAME(Update)(&ctx, data, len);
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
index 256d1bee1b3..fa035a87091 100644
--- a/lib/libc/net/base64.c
+++ b/lib/libc/net/base64.c
@@ -1,4 +1,4 @@
-/* $NetBSD: base64.c,v 1.5 1999/09/16 11:45:11 lukem Exp $ */
+/* $NetBSD: base64.c,v 1.6 1999/09/20 04:39:10 lukem Exp $ */
/*
* Copyright (c) 1996 by Internet Software Consortium.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: base64.c,v 1.5 1999/09/16 11:45:11 lukem Exp $");
+__RCSID("$NetBSD: base64.c,v 1.6 1999/09/20 04:39:10 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -149,10 +149,6 @@ b64_ntop(src, srclength, target, targsize)
_DIAGASSERT(src != NULL);
_DIAGASSERT(target != NULL);
-#ifdef _DIAGNOSTIC
- if (src == NULL || target == NULL)
- return (-1);
-#endif
while (2 < srclength) {
input[0] = *src++;
@@ -228,10 +224,6 @@ b64_pton(src, target, targsize)
_DIAGASSERT(src != NULL);
_DIAGASSERT(target != NULL);
-#ifdef _DIAGNOSTIC
- if (src == NULL || target == NULL)
- return (-1);
-#endif
state = 0;
tarindex = 0;
diff --git a/lib/libc/net/ethers.c b/lib/libc/net/ethers.c
index 38ae3b537cd..313faabbc84 100644
--- a/lib/libc/net/ethers.c
+++ b/lib/libc/net/ethers.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ethers.c,v 1.15 1999/09/16 11:45:11 lukem Exp $ */
+/* $NetBSD: ethers.c,v 1.16 1999/09/20 04:39:11 lukem Exp $ */
/*
* ethers(3N) a la Sun.
@@ -45,10 +45,6 @@ ether_ntoa(e)
static char a[18];
_DIAGASSERT(e != NULL);
-#ifdef _DIAGNOSTIC
- if (e == NULL)
- return NULL;
-#endif
snprintf(a, sizeof a, "%02x:%02x:%02x:%02x:%02x:%02x",
e->ether_addr_octet[0], e->ether_addr_octet[1],
@@ -65,10 +61,6 @@ ether_aton(s)
u_int i[6];
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL)
- return NULL;
-#endif
if (sscanf(s, " %x:%x:%x:%x:%x:%x ", &i[0], &i[1],
&i[2], &i[3], &i[4], &i[5]) == 6) {
@@ -99,12 +91,6 @@ ether_ntohost(hostname, e)
_DIAGASSERT(hostname != NULL);
_DIAGASSERT(e != NULL);
-#ifdef _DIAGNOSTIC
- if (hostname == NULL || e == NULL) {
- errno = EFAULT;
- return -1;
- }
-#endif
#ifdef YP
trylen = snprintf(trybuf, sizeof trybuf, "%x:%x:%x:%x:%x:%x",
@@ -166,12 +152,6 @@ ether_hostton(hostname, e)
_DIAGASSERT(hostname != NULL);
_DIAGASSERT(e != NULL);
-#ifdef _DIAGNOSTIC
- if (hostname == NULL || e == NULL) {
- errno = EFAULT;
- return -1;
- }
-#endif
f = fopen(_PATH_ETHERS, "r");
if (f==NULL)
@@ -224,12 +204,6 @@ ether_line(l, e, hostname)
_DIAGASSERT(l != NULL);
_DIAGASSERT(e != NULL);
_DIAGASSERT(hostname != NULL);
-#ifdef _DIAGNOSTIC
- if (l == NULL || e == NULL || hostname == NULL) {
- errno = EFAULT;
- return -1;
- }
-#endif
if (! buf[0])
snprintf(buf, sizeof buf, " %%x:%%x:%%x:%%x:%%x:%%x %%%ds\\n",
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 482005ad548..a2aa728fb77 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.12 1999/09/16 11:45:11 lukem Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.13 1999/09/20 04:39:11 lukem Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -195,10 +195,6 @@ freeaddrinfo(ai)
struct addrinfo *next;
_DIAGASSERT(ai != NULL);
-#ifdef _DIAGNOSTIC
- if (ai == NULL)
- return;
-#endif
do {
next = ai->ai_next;
@@ -258,12 +254,6 @@ getaddrinfo(hostname, servname, hints, res)
/* servname may be NULL */
/* hints may be NULL */
_DIAGASSERT(res != NULL);
-#ifdef _DIAGNOSTIC
- if (res == NULL) {
- errno = EFAULT;
- return EAI_SYSTEM;
- }
-#endif
/* initialize file static vars */
sentinel.ai_next = NULL;
diff --git a/lib/libc/net/gethnamaddr.c b/lib/libc/net/gethnamaddr.c
index 85d0e6c5532..013db1f1888 100644
--- a/lib/libc/net/gethnamaddr.c
+++ b/lib/libc/net/gethnamaddr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gethnamaddr.c,v 1.25 1999/09/16 11:45:11 lukem Exp $ */
+/* $NetBSD: gethnamaddr.c,v 1.26 1999/09/20 04:39:11 lukem Exp $ */
/*
* ++Copyright++ 1985, 1988, 1993
@@ -61,7 +61,7 @@
static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: gethnamaddr.c,v 1.25 1999/09/16 11:45:11 lukem Exp $");
+__RCSID("$NetBSD: gethnamaddr.c,v 1.26 1999/09/20 04:39:11 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -494,13 +494,6 @@ gethostbyname(name)
struct hostent *hp;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- h_errno = NETDB_INTERNAL;
- return (NULL);
- }
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
h_errno = NETDB_INTERNAL;
@@ -531,13 +524,6 @@ gethostbyname2(name, af)
};
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- h_errno = NETDB_INTERNAL;
- return (NULL);
- }
-#endif
switch (af) {
case AF_INET:
@@ -658,13 +644,6 @@ gethostbyaddr(addr, len, af)
};
_DIAGASSERT(addr != NULL);
-#ifdef _DIAGNOSTIC
- if (addr == NULL) {
- errno = EFAULT;
- h_errno = NETDB_INTERNAL;
- return (NULL);
- }
-#endif
if (af == AF_INET6 && len == IN6ADDRSZ &&
(IN6_IS_ADDR_V4MAPPED((struct in6_addr *)uaddr) ||
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index 59a8dd9a43f..39e7e800840 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getnetnamadr.c,v 1.17 1999/09/16 11:45:12 lukem Exp $ */
+/* $NetBSD: getnetnamadr.c,v 1.18 1999/09/20 04:39:12 lukem Exp $ */
/* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
* Dep. Matematica Universidade de Coimbra, Portugal, Europe
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)getnetbyaddr.c 8.1 (Berkeley) 6/4/93";
static char sccsid_[] = "from getnetnamadr.c 1.4 (Coimbra) 93/06/03";
static char rcsid[] = "Id: getnetnamadr.c,v 8.8 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: getnetnamadr.c,v 1.17 1999/09/16 11:45:12 lukem Exp $");
+__RCSID("$NetBSD: getnetnamadr.c,v 1.18 1999/09/20 04:39:12 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -454,10 +454,6 @@ getnetbyname(net)
};
_DIAGASSERT(net != NULL);
-#ifdef _DIAGNOSTIC
- if (net == NULL)
- return NULL;
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
h_errno = NETDB_INTERNAL;
@@ -579,10 +575,6 @@ _ypnetent(line)
char *cp, *p, **q;
_DIAGASSERT(line != NULL);
-#ifdef _DIAGNOSTIC
- if (line == NULL)
- return (NULL);
-#endif
net_entry.n_name = line;
cp = strpbrk(line, " \t");
diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c
index 83347e1bee1..4d63670705b 100644
--- a/lib/libc/net/getprotoname.c
+++ b/lib/libc/net/getprotoname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getprotoname.c,v 1.7 1999/09/16 11:45:12 lukem Exp $ */
+/* $NetBSD: getprotoname.c,v 1.8 1999/09/20 04:39:12 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getprotoname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getprotoname.c,v 1.7 1999/09/16 11:45:12 lukem Exp $");
+__RCSID("$NetBSD: getprotoname.c,v 1.8 1999/09/20 04:39:12 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,10 +62,6 @@ getprotobyname(name)
register char **cp;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return (NULL);
-#endif
setprotoent(_proto_stayopen);
while ((p = getprotoent()) != NULL) {
diff --git a/lib/libc/net/getservbyname.c b/lib/libc/net/getservbyname.c
index 38b656e4d62..66f34b56540 100644
--- a/lib/libc/net/getservbyname.c
+++ b/lib/libc/net/getservbyname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getservbyname.c,v 1.7 1999/09/16 11:45:13 lukem Exp $ */
+/* $NetBSD: getservbyname.c,v 1.8 1999/09/20 04:39:12 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getservbyname.c,v 1.7 1999/09/16 11:45:13 lukem Exp $");
+__RCSID("$NetBSD: getservbyname.c,v 1.8 1999/09/20 04:39:12 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,10 +62,6 @@ getservbyname(name, proto)
_DIAGASSERT(name != NULL);
/* proto may be NULL */
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return (NULL);
-#endif
setservent(_serv_stayopen);
while ((p = getservent()) != NULL) {
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
index d62e883959d..87ce4267be5 100644
--- a/lib/libc/net/hesiod.c
+++ b/lib/libc/net/hesiod.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hesiod.c,v 1.10 1999/09/16 11:45:13 lukem Exp $ */
+/* $NetBSD: hesiod.c,v 1.11 1999/09/20 04:39:12 lukem Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium.
*
@@ -52,7 +52,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.10 1999/09/16 11:45:13 lukem Exp $");
+__RCSID("$NetBSD: hesiod.c,v 1.11 1999/09/20 04:39:12 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -111,12 +111,6 @@ hesiod_init(context)
int serrno;
_DIAGASSERT(context != NULL);
-#ifdef _DIAGNOSTIC
- if (context == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
ctx = malloc(sizeof(struct hesiod_p));
if (ctx) {
@@ -169,10 +163,6 @@ hesiod_end(context)
struct hesiod_p *ctx = (struct hesiod_p *) context;
_DIAGASSERT(context != NULL);
-#ifdef _DIAGNOSTIC
- if (context == NULL)
- return;
-#endif
free(ctx->rhs);
if (ctx->lhs)
@@ -196,10 +186,6 @@ hesiod_to_bind(void *context, const char *name, const char *type)
_DIAGASSERT(context != NULL);
_DIAGASSERT(name != NULL);
_DIAGASSERT(type != NULL);
-#ifdef _DIAGNOSTIC
- if (context == NULL || name == NULL || type == NULL)
- return (NULL);
-#endif
strcpy(bindname, name);
@@ -276,10 +262,6 @@ hesiod_resolve(context, name, type)
_DIAGASSERT(context != NULL);
_DIAGASSERT(name != NULL);
_DIAGASSERT(type != NULL);
-#ifdef _DIAGNOSTIC
- if (context == NULL || name == NULL || type == NULL)
- return (NULL);
-#endif
bindname = hesiod_to_bind(context, name, type);
if (!bindname)
@@ -302,10 +284,6 @@ hesiod_free_list(context, list)
char **p;
_DIAGASSERT(context != NULL);
-#ifdef _DIAGNOSTIC
- if (context == NULL)
- return;
-#endif
if (list == NULL)
return;
@@ -560,10 +538,6 @@ hes_to_bind(name, type)
_DIAGASSERT(name != NULL);
_DIAGASSERT(type != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || type == NULL)
- return (NULL);
-#endif
if (init_context() < 0)
return NULL;
@@ -584,10 +558,6 @@ hes_resolve(name, type)
_DIAGASSERT(name != NULL);
_DIAGASSERT(type != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || type == NULL)
- return (NULL);
-#endif
if (init_context() < 0)
return NULL;
diff --git a/lib/libc/net/ifname.c b/lib/libc/net/ifname.c
index 43dc4a95fe6..9e745df31ae 100644
--- a/lib/libc/net/ifname.c
+++ b/lib/libc/net/ifname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ifname.c,v 1.4 1999/09/16 11:45:13 lukem Exp $ */
+/* $NetBSD: ifname.c,v 1.5 1999/09/20 04:39:13 lukem Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -57,12 +57,6 @@ if_nametoindex(ifname)
int ret;
_DIAGASSERT(ifname != NULL);
-#ifdef _DIAGNOSTIC
- if (ifname == NULL) {
- errno = EFAULT;
- return 0;
- }
-#endif
if (iff == NULL)
return 0;
@@ -89,12 +83,6 @@ if_indextoname(ifindex, ifname)
char *cp, *dp;
_DIAGASSERT(ifname != NULL);
-#ifdef _DIAGNOSTIC
- if (ifname == NULL) {
- errno = EFAULT;
- return 0;
- }
-#endif
if (iff == NULL)
return NULL;
@@ -230,10 +218,6 @@ if_freenameindex(ptr)
{
_DIAGASSERT(ptr != NULL);
-#ifdef _DIAGNOSTIC
- if (ptr == NULL)
- return;
-#endif
free(ptr);
}
diff --git a/lib/libc/net/inet_net_ntop.c b/lib/libc/net/inet_net_ntop.c
index 602ac8adc9c..022ab48a83e 100644
--- a/lib/libc/net/inet_net_ntop.c
+++ b/lib/libc/net/inet_net_ntop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet_net_ntop.c,v 1.8 1999/09/16 11:45:13 lukem Exp $ */
+/* $NetBSD: inet_net_ntop.c,v 1.9 1999/09/20 04:39:13 lukem Exp $ */
/*
* Copyright (c) 1996 by Internet Software Consortium.
@@ -22,7 +22,7 @@
#if 0
static const char rcsid[] = "Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp ";
#else
-__RCSID("$NetBSD: inet_net_ntop.c,v 1.8 1999/09/16 11:45:13 lukem Exp $");
+__RCSID("$NetBSD: inet_net_ntop.c,v 1.9 1999/09/20 04:39:13 lukem Exp $");
#endif
#endif
@@ -72,12 +72,6 @@ inet_net_ntop(af, src, bits, dst, size)
_DIAGASSERT(src != NULL);
_DIAGASSERT(dst != NULL);
-#ifdef _DIAGNOSTIC
- if (src == NULL || dst == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
switch (af) {
case AF_INET:
diff --git a/lib/libc/net/inet_net_pton.c b/lib/libc/net/inet_net_pton.c
index 76c76b7bc2c..bb4194c64f4 100644
--- a/lib/libc/net/inet_net_pton.c
+++ b/lib/libc/net/inet_net_pton.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet_net_pton.c,v 1.9 1999/09/16 11:45:13 lukem Exp $ */
+/* $NetBSD: inet_net_pton.c,v 1.10 1999/09/20 04:39:13 lukem Exp $ */
/*
* Copyright (c) 1996 by Internet Software Consortium.
@@ -22,7 +22,7 @@
#if 0
static const char rcsid[] = "Id: inet_net_pton.c,v 8.3 1996/11/11 06:36:52 vixie Exp ";
#else
-__RCSID("$NetBSD: inet_net_pton.c,v 1.9 1999/09/16 11:45:13 lukem Exp $");
+__RCSID("$NetBSD: inet_net_pton.c,v 1.10 1999/09/20 04:39:13 lukem Exp $");
#endif
#endif
@@ -75,12 +75,6 @@ inet_net_pton(af, src, dst, size)
_DIAGASSERT(src != NULL);
_DIAGASSERT(dst != NULL);
-#ifdef _DIAGNOSTIC
- if (src == NULL || dst == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
switch (af) {
case AF_INET:
diff --git a/lib/libc/net/inet_neta.c b/lib/libc/net/inet_neta.c
index b64eb8e17a9..6ec1b0d43e9 100644
--- a/lib/libc/net/inet_neta.c
+++ b/lib/libc/net/inet_neta.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet_neta.c,v 1.9 1999/09/16 11:45:14 lukem Exp $ */
+/* $NetBSD: inet_neta.c,v 1.10 1999/09/20 04:39:13 lukem Exp $ */
/*
* Copyright (c) 1996 by Internet Software Consortium.
@@ -22,7 +22,7 @@
#if 0
static const char rcsid[] = "Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp ";
#else
-__RCSID("$NetBSD: inet_neta.c,v 1.9 1999/09/16 11:45:14 lukem Exp $");
+__RCSID("$NetBSD: inet_neta.c,v 1.10 1999/09/20 04:39:13 lukem Exp $");
#endif
#endif
@@ -68,12 +68,6 @@ inet_neta(src, dst, size)
char *tp;
_DIAGASSERT(dst != NULL);
-#ifdef _DIAGNOSTIC
- if (dst == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
while (src & 0xffffffff) {
u_char b = (u_char)((src & 0xff000000) >> 24);
diff --git a/lib/libc/net/inet_network.c b/lib/libc/net/inet_network.c
index 6e7406bc967..76384928369 100644
--- a/lib/libc/net/inet_network.c
+++ b/lib/libc/net/inet_network.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet_network.c,v 1.8 1999/09/16 11:45:14 lukem Exp $ */
+/* $NetBSD: inet_network.c,v 1.9 1999/09/20 04:39:14 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: inet_network.c,v 1.8 1999/09/16 11:45:14 lukem Exp $");
+__RCSID("$NetBSD: inet_network.c,v 1.9 1999/09/20 04:39:14 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,10 +69,6 @@ inet_network(cp)
register int i;
_DIAGASSERT(cp != NULL);
-#ifdef _DIAGNOSTIC
- if (cp == NULL)
- return (INADDR_NONE);
-#endif
again:
val = 0; base = 10;
diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c
index 22002dbf80a..eb9f392b4ac 100644
--- a/lib/libc/net/inet_ntop.c
+++ b/lib/libc/net/inet_ntop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet_ntop.c,v 1.7 1999/09/16 11:45:14 lukem Exp $ */
+/* $NetBSD: inet_ntop.c,v 1.8 1999/09/20 04:39:14 lukem Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium.
*
@@ -21,7 +21,7 @@
#if 0
static char rcsid[] = "Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp ";
#else
-__RCSID("$NetBSD: inet_ntop.c,v 1.7 1999/09/16 11:45:14 lukem Exp $");
+__RCSID("$NetBSD: inet_ntop.c,v 1.8 1999/09/20 04:39:14 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -75,12 +75,6 @@ inet_ntop(af, src, dst, size)
_DIAGASSERT(src != NULL);
_DIAGASSERT(dst != NULL);
-#ifdef _DIAGNOSTIC
- if (src == NULL || dst == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
switch (af) {
case AF_INET:
diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c
index 4fe6ff23c43..8b9544ea0c4 100644
--- a/lib/libc/net/inet_pton.c
+++ b/lib/libc/net/inet_pton.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inet_pton.c,v 1.11 1999/09/16 11:45:14 lukem Exp $ */
+/* $NetBSD: inet_pton.c,v 1.12 1999/09/20 04:39:14 lukem Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium.
*
@@ -21,7 +21,7 @@
#if 0
static char rcsid[] = "Id: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp ";
#else
-__RCSID("$NetBSD: inet_pton.c,v 1.11 1999/09/16 11:45:14 lukem Exp $");
+__RCSID("$NetBSD: inet_pton.c,v 1.12 1999/09/20 04:39:14 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,12 +72,6 @@ inet_pton(af, src, dst)
_DIAGASSERT(src != NULL);
_DIAGASSERT(dst != NULL);
-#ifdef _DIAGNOSTIC
- if (src == NULL || dst == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
switch (af) {
case AF_INET:
@@ -315,10 +309,6 @@ inet_addr(cp)
struct in_addr val;
_DIAGASSERT(cp != NULL);
-#ifdef _DIAGNOSTIC
- if (cp == NULL)
- return (INADDR_NONE);
-#endif
if (inet_pton4(cp, (u_char *)(void *)&val.s_addr))
return (val.s_addr);
@@ -340,10 +330,6 @@ inet_aton(cp, addr)
_DIAGASSERT(cp != NULL);
_DIAGASSERT(addr != NULL);
-#ifdef _DIAGNOSTIC
- if (cp == NULL || addr == NULL)
- return (0);
-#endif
return inet_pton4(cp, (u_char *)(void *)&addr->s_addr);
}
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
index 42c5e548c29..911caba2301 100644
--- a/lib/libc/net/ip6opt.c
+++ b/lib/libc/net/ip6opt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6opt.c,v 1.3 1999/09/16 11:45:15 lukem Exp $ */
+/* $NetBSD: ip6opt.c,v 1.4 1999/09/20 04:39:15 lukem Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -75,10 +75,6 @@ inet6_option_init(bp, cmsgp, type)
_DIAGASSERT(bp != NULL);
_DIAGASSERT(cmsgp != NULL);
-#ifdef _DIAGNOSTIC
- if (bp == NULL || cmsgp == NULL)
- return (-1);
-#endif
ch = (struct cmsghdr *)bp;
@@ -117,10 +113,6 @@ inet6_option_append(cmsg, typep, multx, plusy)
_DIAGASSERT(cmsg != NULL);
_DIAGASSERT(typep != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL || typep == NULL)
- return (-1);
-#endif
bp = (u_char *)cmsg + cmsg->cmsg_len;
eh = (struct ip6_ext *)CMSG_DATA(cmsg);
@@ -201,10 +193,6 @@ inet6_option_alloc(cmsg, datalen, multx, plusy)
struct ip6_ext *eh;
_DIAGASSERT(cmsg != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL)
- return(NULL);
-#endif
bp = (u_char *)cmsg + cmsg->cmsg_len;
eh = (struct ip6_ext *)CMSG_DATA(cmsg);
@@ -274,12 +262,6 @@ inet6_option_next(cmsg, tptrp)
_DIAGASSERT(cmsg != NULL);
_DIAGASSERT(tptrp != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL || tptrp == NULL) {
- /* XXX: can't set tptrp to non NULL for this error... */
- return (-1);
- }
-#endif
if (cmsg->cmsg_level != IPPROTO_IPV6 ||
(cmsg->cmsg_type != IPV6_HOPOPTS &&
@@ -342,12 +324,6 @@ inet6_option_find(cmsg, tptrp, type)
_DIAGASSERT(cmsg != NULL);
_DIAGASSERT(tptrp != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL || tptrp == NULL) {
- /* XXX: can't set tptrp to non NULL for this error... */
- return (-1);
- }
-#endif
if (cmsg->cmsg_level != IPPROTO_IPV6 ||
(cmsg->cmsg_type != IPV6_HOPOPTS &&
diff --git a/lib/libc/net/iso_addr.c b/lib/libc/net/iso_addr.c
index 5e0d7f9d82c..8b07bcc166a 100644
--- a/lib/libc/net/iso_addr.c
+++ b/lib/libc/net/iso_addr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iso_addr.c,v 1.9 1999/09/16 11:45:15 lukem Exp $ */
+/* $NetBSD: iso_addr.c,v 1.10 1999/09/20 04:39:15 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)iso_addr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: iso_addr.c,v 1.9 1999/09/16 11:45:15 lukem Exp $");
+__RCSID("$NetBSD: iso_addr.c,v 1.10 1999/09/20 04:39:15 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -68,10 +68,6 @@ iso_addr(addr)
register int newaddr = 0; /* pacify gcc */
_DIAGASSERT(addr != NULL);
-#ifdef _DIAGNOSTIC
- if (addr == NULL)
- return (NULL);
-#endif
(void)memset(&out_addr, 0, sizeof (out_addr));
do {
@@ -120,10 +116,6 @@ iso_ntoa(isoa)
u_char *inlim = in + isoa->isoa_len;
_DIAGASSERT(isoa != NULL);
-#ifdef _DIAGNOSTIC
- if (isoa == NULL)
- return (NULL);
-#endif
out[1] = 0;
while (in < inlim) {
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
index 2df955ef7ea..89f4f079e1d 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linkaddr.c,v 1.10 1999/09/16 11:45:15 lukem Exp $ */
+/* $NetBSD: linkaddr.c,v 1.11 1999/09/20 04:39:15 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)linkaddr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: linkaddr.c,v 1.10 1999/09/16 11:45:15 lukem Exp $");
+__RCSID("$NetBSD: linkaddr.c,v 1.11 1999/09/20 04:39:15 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,10 +72,6 @@ link_addr(addr, sdl)
_DIAGASSERT(addr != NULL);
_DIAGASSERT(sdl != NULL);
-#ifdef _DIAGNOSTIC
- if (addr == NULL || sdl == NULL)
- return;
-#endif
(void)memset(&sdl->sdl_family, 0, (size_t)sdl->sdl_len - 1);
sdl->sdl_family = AF_LINK;
@@ -151,10 +147,6 @@ link_ntoa(sdl)
int firsttime = 1;
_DIAGASSERT(sdl != NULL);
-#ifdef _DIAGNOSTIC
- if (sdl == NULL)
- return (NULL);
-#endif
if (sdl->sdl_nlen) {
(void)memcpy(obuf, sdl->sdl_data, (size_t)sdl->sdl_nlen);
diff --git a/lib/libc/net/ns_addr.c b/lib/libc/net/ns_addr.c
index ad85da30959..044c72e1fef 100644
--- a/lib/libc/net/ns_addr.c
+++ b/lib/libc/net/ns_addr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ns_addr.c,v 1.9 1999/09/16 11:45:16 lukem Exp $ */
+/* $NetBSD: ns_addr.c,v 1.10 1999/09/20 04:39:15 lukem Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ns_addr.c 8.1 (Berkeley) 6/7/93";
#else
-__RCSID("$NetBSD: ns_addr.c,v 1.9 1999/09/16 11:45:16 lukem Exp $");
+__RCSID("$NetBSD: ns_addr.c,v 1.10 1999/09/20 04:39:15 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,10 +65,6 @@ ns_addr(name)
char buf[50];
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return (zero_addr);
-#endif
(void)strncpy(buf, name, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
diff --git a/lib/libc/net/nsap_addr.c b/lib/libc/net/nsap_addr.c
index 062130600eb..c81bf84290f 100644
--- a/lib/libc/net/nsap_addr.c
+++ b/lib/libc/net/nsap_addr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsap_addr.c,v 1.8 1999/09/16 11:45:16 lukem Exp $ */
+/* $NetBSD: nsap_addr.c,v 1.9 1999/09/20 04:39:16 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -53,7 +53,7 @@
#if 0
static char rcsid[] = "Id: nsap_addr.c,v 8.3 1996/08/05 08:31:35 vixie Exp ";
#else
-__RCSID("$NetBSD: nsap_addr.c,v 1.8 1999/09/16 11:45:16 lukem Exp $");
+__RCSID("$NetBSD: nsap_addr.c,v 1.9 1999/09/20 04:39:16 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -99,10 +99,6 @@ inet_nsap_addr(ascii, binary, maxlen)
_DIAGASSERT(ascii != NULL);
_DIAGASSERT(binary != NULL);
-#ifdef _DIAGNOSTIC
- if (ascii == NULL || binary == NULL)
- return (0);
-#endif
while ((c = *ascii++) != '\0' && len < maxlen) {
if (c == '.' || c == '+' || c == '/')
@@ -142,10 +138,6 @@ inet_nsap_ntoa(binlen, binary, ascii)
char *start;
_DIAGASSERT(binary != NULL);
-#ifdef _DIAGNOSTIC
- if (binary == NULL)
- return (NULL);
-#endif
if (ascii)
start = ascii;
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
index 2d666d7f7bc..c51de8f5028 100644
--- a/lib/libc/net/nsdispatch.c
+++ b/lib/libc/net/nsdispatch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsdispatch.c,v 1.13 1999/09/16 23:43:52 lukem Exp $ */
+/* $NetBSD: nsdispatch.c,v 1.14 1999/09/20 04:39:16 lukem Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nsdispatch.c,v 1.13 1999/09/16 23:43:52 lukem Exp $");
+__RCSID("$NetBSD: nsdispatch.c,v 1.14 1999/09/20 04:39:16 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -107,10 +107,6 @@ _nsdbtaddsrc(dbt, src)
_DIAGASSERT(dbt != NULL);
_DIAGASSERT(src != NULL);
-#ifdef _DIAGNOSTIC
- if (dbt == NULL || src == NULL)
- return;
-#endif
if ((dbt->srclistsize % NSELEMSPERCHUNK) == 0) {
dbt->srclist = (ns_src *)realloc(dbt->srclist,
@@ -129,10 +125,6 @@ _nsdbtdump(dbt)
int i;
_DIAGASSERT(dbt != NULL);
-#ifdef _DIAGNOSTIC
- if (dbt == NULL)
- return;
-#endif
printf("%s (%d source%s):", dbt->name, dbt->srclistsize,
dbt->srclistsize == 1 ? "" : "s");
@@ -170,10 +162,6 @@ _nsdbtget(name)
extern int _nsyyparse __P((void));
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return (NULL);
-#endif
dbt.name = name;
@@ -228,10 +216,6 @@ _nsdbtput(dbt)
int i;
_DIAGASSERT(dbt != NULL);
-#ifdef _DIAGNOSTIC
- if (dbt == NULL)
- return;
-#endif
for (i = 0; i < _nsmapsize; i++) {
if (_nscmp(dbt, &_nsmap[i]) == 0) {
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 016ffe7b900..91ad258ed3a 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rcmd.c,v 1.33 1999/09/16 11:45:17 lukem Exp $ */
+/* $NetBSD: rcmd.c,v 1.34 1999/09/20 04:39:16 lukem Exp $ */
/*
* Copyright (c) 1997 Matthew R. Green.
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94";
#else
-__RCSID("$NetBSD: rcmd.c,v 1.33 1999/09/16 11:45:17 lukem Exp $");
+__RCSID("$NetBSD: rcmd.c,v 1.34 1999/09/20 04:39:16 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -98,10 +98,6 @@ rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
_DIAGASSERT(remuser != NULL);
_DIAGASSERT(cmd != NULL);
/* fd2p may be NULL */
-#ifdef _DIAGNOSTIC
- if (ahost == NULL || locuser == NULL || remuser == NULL || cmd == NULL)
- return (-1);
-#endif
/*
* Canonicalise hostname.
@@ -143,10 +139,6 @@ orcmd(ahost, rport, locuser, remuser, cmd, fd2p)
_DIAGASSERT(remuser != NULL);
_DIAGASSERT(cmd != NULL);
/* fd2p may be NULL */
-#ifdef _DIAGNOSTIC
- if (ahost == NULL || locuser == NULL || remuser == NULL || cmd == NULL)
- return (-1);
-#endif
hp = gethostbyname(*ahost);
if (hp == NULL) {
@@ -433,12 +425,6 @@ rresvport(alport)
{
_DIAGASSERT(alport != NULL);
-#ifdef _DIAGNOSTIC
- if (alport == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
return rresvport_af(alport, AF_INET);
}
@@ -455,12 +441,6 @@ rresvport_af(alport, family)
u_int16_t *portp;
_DIAGASSERT(alport != NULL);
-#ifdef _DIAGNOSTIC
- if (alport == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
memset(&ss, 0, sizeof(ss));
sa = (struct sockaddr *)&ss;
@@ -535,10 +515,6 @@ ruserok(rhost, superuser, ruser, luser)
_DIAGASSERT(rhost != NULL);
_DIAGASSERT(ruser != NULL);
_DIAGASSERT(luser != NULL);
-#ifdef _DIAGNOSTIC
- if (rhost == NULL || ruser == NULL || luser == NULL)
- return (-1);
-#endif
if ((hp = gethostbyname(rhost)) == NULL)
return (-1);
@@ -578,10 +554,6 @@ iruserok(raddr, superuser, ruser, luser)
_DIAGASSERT(ruser != NULL);
_DIAGASSERT(luser != NULL);
-#ifdef _DIAGNOSTIC
- if (ruser == NULL || luser == NULL)
- return (-1);
-#endif
first = 1;
hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
@@ -668,10 +640,6 @@ __ivaliduser(hostf, raddr, luser, ruser)
_DIAGASSERT(hostf != NULL);
_DIAGASSERT(luser != NULL);
_DIAGASSERT(ruser != NULL);
-#ifdef _DIAGNOSTIC
- if (hostf == NULL || luser == NULL || ruser == NULL)
- return (-1);
-#endif
while (fgets(buf, sizeof(buf), hostf)) {
p = buf;
diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c
index 2530b908a47..172cca9b0a9 100644
--- a/lib/libc/net/res_comp.c
+++ b/lib/libc/net/res_comp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: res_comp.c,v 1.15 1999/09/16 11:45:17 lukem Exp $ */
+/* $NetBSD: res_comp.c,v 1.16 1999/09/20 04:39:17 lukem Exp $ */
/*-
* Copyright (c) 1985, 1993
@@ -59,7 +59,7 @@
static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: res_comp.c,v 8.12 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: res_comp.c,v 1.15 1999/09/16 11:45:17 lukem Exp $");
+__RCSID("$NetBSD: res_comp.c,v 1.16 1999/09/20 04:39:17 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -106,10 +106,6 @@ dn_expand(msg, eomorig, comp_dn, exp_dn, length)
_DIAGASSERT(eomorig != NULL);
_DIAGASSERT(comp_dn != NULL);
_DIAGASSERT(exp_dn != NULL);
-#ifdef _DIAGNOSTIC
- if (msg == NULL || eomorig == NULL || comp_dn == NULL || exp_dn == NULL)
- return (-1);
-#endif
dn = exp_dn;
cp = comp_dn;
@@ -200,10 +196,6 @@ dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
_DIAGASSERT(comp_dn != NULL);
/* dnptr may be NULL */
/* lastdnptr may be NULL */
-#ifdef _DIAGNOSTIC
- if (exp_dn == NULL || comp_dn == NULL)
- return (-1);
-#endif
dn = (const u_char *)exp_dn;
cp = comp_dn;
@@ -285,10 +277,6 @@ __dn_skipname(comp_dn, eom)
_DIAGASSERT(comp_dn != NULL);
_DIAGASSERT(eom != NULL);
-#ifdef _DIAGNOSTIC
- if (comp_dn == NULL || eom == NULL)
- return (-1);
-#endif
cp = comp_dn;
while (cp < eom && (n = *cp++)) {
@@ -415,10 +403,6 @@ res_hnok(dn)
int pch = PERIOD, ch = *dn++;
_DIAGASSERT(dn != NULL);
-#ifdef _DIAGNOSTIC
- if (dn == NULL)
- return (0);
-#endif
while (ch != '\0') {
int nch = *dn++;
@@ -449,10 +433,6 @@ res_ownok(dn)
const char *dn;
{
_DIAGASSERT(dn != NULL);
-#ifdef _DIAGNOSTIC
- if (dn == NULL)
- return (0);
-#endif
if (asterchar(dn[0])) {
if (periodchar(dn[1]))
@@ -474,10 +454,6 @@ res_mailok(dn)
int ch, escaped = 0;
_DIAGASSERT(dn != NULL);
-#ifdef _DIAGNOSTIC
- if (dn == NULL)
- return (0);
-#endif
/* "." is a valid missing representation */
if (*dn == '\0')
@@ -510,10 +486,6 @@ res_dnok(dn)
int ch;
_DIAGASSERT(dn != NULL);
-#ifdef _DIAGNOSTIC
- if (dn == NULL)
- return (0);
-#endif
while ((ch = *dn++) != '\0')
if (!domainchar(ch))
@@ -535,10 +507,6 @@ _getshort(msgp)
register u_int16_t u;
_DIAGASSERT(msgp != NULL);
-#ifdef _DIAGNOSTIC
- if (msgp == NULL)
- return (0);
-#endif
GETSHORT(u, msgp);
return (u);
@@ -551,10 +519,6 @@ _getlong(msgp)
register u_int32_t u;
_DIAGASSERT(msgp != NULL);
-#ifdef _DIAGNOSTIC
- if (msgp == NULL)
- return (0);
-#endif
GETLONG(u, msgp);
return (u);
@@ -571,10 +535,6 @@ __putshort(s, msgp)
{
_DIAGASSERT(msgp != NULL);
-#ifdef _DIAGNOSTIC
- if (msgp == NULL)
- return;
-#endif
PUTSHORT(s, msgp);
}
@@ -586,10 +546,6 @@ __putlong(l, msgp)
{
_DIAGASSERT(msgp != NULL);
-#ifdef _DIAGNOSTIC
- if (msgp == NULL)
- return;
-#endif
PUTLONG(l, msgp);
}
diff --git a/lib/libc/net/res_debug.c b/lib/libc/net/res_debug.c
index 1c228bb6f36..c75e93e4588 100644
--- a/lib/libc/net/res_debug.c
+++ b/lib/libc/net/res_debug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: res_debug.c,v 1.24 1999/09/16 11:45:17 lukem Exp $ */
+/* $NetBSD: res_debug.c,v 1.25 1999/09/20 04:39:17 lukem Exp $ */
/*-
* Copyright (c) 1985, 1990, 1993
@@ -81,7 +81,7 @@
static char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: res_debug.c,v 8.20 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: res_debug.c,v 1.24 1999/09/16 11:45:17 lukem Exp $");
+__RCSID("$NetBSD: res_debug.c,v 1.25 1999/09/20 04:39:17 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -268,10 +268,6 @@ __p_query(msg)
{
_DIAGASSERT(msg != NULL);
-#ifdef _DIAGNOSTIC
- if (msg == NULL)
- return;
-#endif
__fp_query(msg, stdout);
}
@@ -289,10 +285,6 @@ __fp_resstat(statp, file)
_DIAGASSERT(file != NULL);
/* statp may be NULL */
-#ifdef _DIAGNOSTIC
- if (file == NULL)
- return;
-#endif
fprintf(file, ";; res options:");
if (!statp)
@@ -319,10 +311,6 @@ __fp_nquery(msg, len, file)
_DIAGASSERT(msg != NULL);
_DIAGASSERT(file != NULL);
-#ifdef _DIAGNOSTIC
- if (msg == NULL || file == NULL)
- return;
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1)
return;
@@ -450,10 +438,6 @@ __fp_query(msg, file)
_DIAGASSERT(msg != NULL);
_DIAGASSERT(file != NULL);
-#ifdef _DIAGNOSTIC
- if (msg == NULL || file == NULL)
- return;
-#endif
fp_nquery(msg, PACKETSZ, file);
}
@@ -469,10 +453,6 @@ __p_cdnname(cp, msg, len, file)
_DIAGASSERT(msg != NULL);
_DIAGASSERT(file != NULL);
-#ifdef _DIAGNOSTIC
- if (msg == NULL || file == NULL)
- return (NULL);
-#endif
if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0)
return (NULL);
@@ -492,10 +472,6 @@ __p_cdname(cp, msg, file)
_DIAGASSERT(cp != NULL);
_DIAGASSERT(msg != NULL);
_DIAGASSERT(file != NULL);
-#ifdef _DIAGNOSTIC
- if (cp == NULL || msg == NULL || file == NULL)
- return (NULL);
-#endif
return (p_cdnname(cp, msg, PACKETSZ, file));
}
@@ -516,10 +492,6 @@ __p_fqnname(cp, msg, msglen, name, namelen)
_DIAGASSERT(cp != NULL);
_DIAGASSERT(msg != NULL);
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (cp == NULL || msg == NULL || name == NULL)
- return (NULL);
-#endif
if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
return (NULL);
@@ -547,10 +519,6 @@ __p_fqname(cp, msg, file)
_DIAGASSERT(cp != NULL);
_DIAGASSERT(msg != NULL);
_DIAGASSERT(file != NULL);
-#ifdef _DIAGNOSTIC
- if (cp == NULL || msg == NULL || file == NULL)
- return (NULL);
-#endif
n = __p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
if (n == NULL)
@@ -579,10 +547,6 @@ __p_rr(cp, msg, file)
_DIAGASSERT(cp != NULL);
_DIAGASSERT(msg != NULL);
_DIAGASSERT(file != NULL);
-#ifdef _DIAGNOSTIC
- if (cp == NULL || msg == NULL || file == NULL)
- return (NULL);
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
h_errno = NETDB_INTERNAL;
@@ -1037,10 +1001,6 @@ __sym_ston(syms, name, success)
_DIAGASSERT(syms != NULL);
_DIAGASSERT(name != NULL);
/* success may be NULL */
-#ifdef _DIAGNOSTIC
- if (syms == NULL || name == NULL)
- return (NULL);
-#endif
for (; syms->name != 0; syms++) {
if (strcasecmp (name, syms->name) == 0) {
@@ -1064,10 +1024,6 @@ __sym_ntos(syms, number, success)
_DIAGASSERT(syms != NULL);
/* success may be NULL */
-#ifdef _DIAGNOSTIC
- if (syms == NULL)
- return (NULL);
-#endif
for (; syms->name != 0; syms++) {
if (number == syms->number) {
@@ -1094,10 +1050,6 @@ __sym_ntop(syms, number, success)
_DIAGASSERT(syms != NULL);
/* success may be NULL */
-#ifdef _DIAGNOSTIC
- if (syms == NULL)
- return (NULL);
-#endif
for (; syms->name != 0; syms++) {
if (number == syms->number) {
@@ -1422,10 +1374,6 @@ loc_aton(ascii, binary)
_DIAGASSERT(ascii != NULL);
_DIAGASSERT(binary != NULL);
-#ifdef _DIAGNOSTIC
- if (ascii == NULL || binary == NULL)
- return (0);
-#endif
cp = ascii;
maxcp = cp + strlen(ascii);
@@ -1545,10 +1493,6 @@ loc_ntoa(binary, ascii)
_DIAGASSERT(ascii != NULL);
_DIAGASSERT(binary != NULL);
-#ifdef _DIAGNOSTIC
- if (ascii == NULL || binary == NULL)
- return (NULL);
-#endif
versionval = *cp++;
@@ -1640,10 +1584,6 @@ __dn_count_labels(name)
int i, len, count;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return (0);
-#endif
len = strlen(name);
diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c
index 69b71c3e3a7..b61eecbfec3 100644
--- a/lib/libc/net/res_mkquery.c
+++ b/lib/libc/net/res_mkquery.c
@@ -1,4 +1,4 @@
-/* $NetBSD: res_mkquery.c,v 1.15 1999/09/16 11:45:18 lukem Exp $ */
+/* $NetBSD: res_mkquery.c,v 1.16 1999/09/20 04:39:18 lukem Exp $ */
/*-
* Copyright (c) 1985, 1993
@@ -59,7 +59,7 @@
static char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: res_mkquery.c,v 8.5 1996/08/27 08:33:28 vixie Exp ";
#else
-__RCSID("$NetBSD: res_mkquery.c,v 1.15 1999/09/16 11:45:18 lukem Exp $");
+__RCSID("$NetBSD: res_mkquery.c,v 1.16 1999/09/20 04:39:18 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -105,13 +105,6 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
_DIAGASSERT(dname != NULL);
/* data may be NULL */
/* newrr_in is not used */
-#ifdef _DIAGNOSTIC
- if (dname == NULL) {
- errno = EFAULT;
- h_errno = NETDB_INTERNAL;
- return (-1);
- }
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
h_errno = NETDB_INTERNAL;
diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c
index 9a080991acb..55aa775be6e 100644
--- a/lib/libc/net/res_query.c
+++ b/lib/libc/net/res_query.c
@@ -1,4 +1,4 @@
-/* $NetBSD: res_query.c,v 1.23 1999/09/16 11:45:18 lukem Exp $ */
+/* $NetBSD: res_query.c,v 1.24 1999/09/20 04:39:18 lukem Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -59,7 +59,7 @@
static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: res_query.c,v 8.10 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: res_query.c,v 1.23 1999/09/16 11:45:18 lukem Exp $");
+__RCSID("$NetBSD: res_query.c,v 1.24 1999/09/20 04:39:18 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -119,12 +119,6 @@ res_query(name, class, type, answer, anslen)
_DIAGASSERT(name != NULL);
_DIAGASSERT(answer != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || answer == NULL) {
- h_errno = NETDB_INTERNAL;
- return (-1);
- }
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
h_errno = NETDB_INTERNAL;
@@ -204,12 +198,6 @@ res_search(name, class, type, answer, anslen)
_DIAGASSERT(name != NULL);
_DIAGASSERT(answer != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || answer == NULL) {
- h_errno = NETDB_INTERNAL;
- return (-1);
- }
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
h_errno = NETDB_INTERNAL;
@@ -354,12 +342,6 @@ res_querydomain(name, domain, class, type, answer, anslen)
_DIAGASSERT(name != NULL);
/* domain may be NULL */
_DIAGASSERT(answer != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || answer == NULL) {
- h_errno = NETDB_INTERNAL;
- return (-1);
- }
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
h_errno = NETDB_INTERNAL;
@@ -408,10 +390,6 @@ __hostalias(name)
static char abuf[MAXDNAME];
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return (NULL);
-#endif
if (_res.options & RES_NOALIASES)
return (NULL);
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c
index ea03266f35d..6b7af350425 100644
--- a/lib/libc/net/res_send.c
+++ b/lib/libc/net/res_send.c
@@ -1,4 +1,4 @@
-/* $NetBSD: res_send.c,v 1.21 1999/09/16 11:45:19 lukem Exp $ */
+/* $NetBSD: res_send.c,v 1.22 1999/09/20 04:39:18 lukem Exp $ */
/*-
* Copyright (c) 1985, 1989, 1993
@@ -59,7 +59,7 @@
static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: res_send.c,v 8.13 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: res_send.c,v 1.21 1999/09/16 11:45:19 lukem Exp $");
+__RCSID("$NetBSD: res_send.c,v 1.22 1999/09/20 04:39:18 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -211,10 +211,6 @@ res_isourserver(inp)
int ns, ret;
_DIAGASSERT(inp != NULL);
-#ifdef _DIAGNOSTIC
- if (inp == NULL)
- return (0);
-#endif
#ifdef INET6
ret = 0;
@@ -286,10 +282,6 @@ res_nameinquery(name, type, class, buf, eom)
_DIAGASSERT(name != NULL);
_DIAGASSERT(buf != NULL);
_DIAGASSERT(eom != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || buf == NULL || eom == NULL)
- return (-1);
-#endif
while (qdcount-- > 0) {
char tname[MAXDNAME+1];
@@ -332,10 +324,6 @@ res_queriesmatch(buf1, eom1, buf2, eom2)
_DIAGASSERT(eom1 != NULL);
_DIAGASSERT(buf2 != NULL);
_DIAGASSERT(eom2 != NULL);
-#ifdef _DIAGNOSTIC
- if (buf1 == NULL || eom1 == NULL || buf2 == NULL || eom2 == NULL)
- return (-1);
-#endif
if (qdcount != ntohs(((const HEADER *)(const void *)buf2)->qdcount))
return (0);
@@ -370,12 +358,6 @@ res_send(buf, buflen, ans, anssiz)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(ans != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || ans == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
/* errno should have been set by res_init() in this case. */
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
index 4a8d0875d9f..dddb6cb8443 100644
--- a/lib/libc/net/rthdr.c
+++ b/lib/libc/net/rthdr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rthdr.c,v 1.3 1999/09/16 11:45:19 lukem Exp $ */
+/* $NetBSD: rthdr.c,v 1.4 1999/09/20 04:39:18 lukem Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -67,10 +67,6 @@ inet6_rthdr_init(bp, type)
register struct ip6_rthdr *rthdr;
_DIAGASSERT(bp != NULL);
-#ifdef _DIAGNOSTIC
- if (bp == NULL)
- return(NULL);
-#endif
ch = (struct cmsghdr *)bp;
rthdr = (struct ip6_rthdr *)(ch + 1);
@@ -102,10 +98,6 @@ inet6_rthdr_add(cmsg, addr, flags)
_DIAGASSERT(cmsg != NULL);
_DIAGASSERT(addr != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL || addr == NULL)
- return (-1);
-#endif
rthdr = (struct ip6_rthdr *)(cmsg + 1);
@@ -157,10 +149,6 @@ inet6_rthdr_lasthop(cmsg, flags)
register struct ip6_rthdr *rthdr;
_DIAGASSERT(cmsg != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL)
- return (-1);
-#endif
rthdr = (struct ip6_rthdr *)(cmsg + 1);
@@ -219,10 +207,6 @@ inet6_rthdr_segments(cmsg)
register struct ip6_rthdr *rthdr;
_DIAGASSERT(cmsg != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL)
- return (-1);
-#endif
rthdr = (struct ip6_rthdr *)(cmsg + 1);
@@ -259,10 +243,6 @@ inet6_rthdr_getaddr(cmsg, index)
register struct ip6_rthdr *rthdr;
_DIAGASSERT(cmsg != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL)
- return (NULL);
-#endif
rthdr = (struct ip6_rthdr *)(cmsg + 1);
@@ -306,10 +286,6 @@ inet6_rthdr_getflags(cmsg, index)
register struct ip6_rthdr *rthdr;
_DIAGASSERT(cmsg != NULL);
-#ifdef _DIAGNOSTIC
- if (cmsg == NULL)
- return (-1);
-#endif
rthdr = (struct ip6_rthdr *)(cmsg + 1);
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index 2e89d467dff..d39098cfde3 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regcomp.c,v 1.14 1999/09/16 11:45:21 lukem Exp $ */
+/* $NetBSD: regcomp.c,v 1.15 1999/09/20 04:39:19 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -44,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94";
#else
-__RCSID("$NetBSD: regcomp.c,v 1.14 1999/09/16 11:45:21 lukem Exp $");
+__RCSID("$NetBSD: regcomp.c,v 1.15 1999/09/20 04:39:19 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -210,10 +210,6 @@ int cflags;
_DIAGASSERT(preg != NULL);
_DIAGASSERT(pattern != NULL);
-#ifdef _DIAGNOSTIC
- if (preg == NULL || pattern == NULL)
- return (REG_INVARG);
-#endif
cflags = GOODFLAGS(cflags);
if ((cflags&REG_EXTENDED) && (cflags&REG_NOSPEC))
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index 3b601681c98..36ec86e9e64 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regerror.c,v 1.14 1999/09/17 09:33:34 kleink Exp $ */
+/* $NetBSD: regerror.c,v 1.15 1999/09/20 04:39:19 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -44,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)regerror.c 8.4 (Berkeley) 3/20/94";
#else
-__RCSID("$NetBSD: regerror.c,v 1.14 1999/09/17 09:33:34 kleink Exp $");
+__RCSID("$NetBSD: regerror.c,v 1.15 1999/09/20 04:39:19 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -141,10 +141,6 @@ size_t errbuf_size;
_DIAGASSERT(errcode != REG_ATOI || preg != NULL);
_DIAGASSERT(errbuf != NULL);
-#ifdef _DIAGNOSTIC
- if ((errcode == REG_ATOI && preg == NULL) || errbuf == NULL)
- return(0);
-#endif
if (errcode == REG_ATOI)
s = regatoi(preg, convbuf, sizeof convbuf);
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
index 138de1e9bae..794cb465d3c 100644
--- a/lib/libc/regex/regexec.c
+++ b/lib/libc/regex/regexec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regexec.c,v 1.13 1999/09/16 11:45:21 lukem Exp $ */
+/* $NetBSD: regexec.c,v 1.14 1999/09/20 04:39:20 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -44,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)regexec.c 8.3 (Berkeley) 3/20/94";
#else
-__RCSID("$NetBSD: regexec.c,v 1.13 1999/09/16 11:45:21 lukem Exp $");
+__RCSID("$NetBSD: regexec.c,v 1.14 1999/09/20 04:39:20 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -182,10 +182,6 @@ int eflags;
_DIAGASSERT(preg != NULL);
_DIAGASSERT(string != NULL);
-#ifdef _DIAGNOSTIC
- if (preg == NULL || string == NULL)
- return (REG_INVARG);
-#endif
if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
return(REG_BADPAT);
diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c
index 228a9bc7c47..912376ac5a2 100644
--- a/lib/libc/regex/regfree.c
+++ b/lib/libc/regex/regfree.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regfree.c,v 1.10 1999/09/16 11:45:21 lukem Exp $ */
+/* $NetBSD: regfree.c,v 1.11 1999/09/20 04:39:20 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -44,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)regfree.c 8.3 (Berkeley) 3/20/94";
#else
-__RCSID("$NetBSD: regfree.c,v 1.10 1999/09/16 11:45:21 lukem Exp $");
+__RCSID("$NetBSD: regfree.c,v 1.11 1999/09/20 04:39:20 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -74,10 +74,6 @@ regex_t *preg;
struct re_guts *g;
_DIAGASSERT(preg != NULL);
-#ifdef _DIAGNOSTIC
- if (preg == NULL)
- return;
-#endif
_DIAGASSERT(preg->re_magic == MAGIC1);
if (preg->re_magic != MAGIC1) /* oops */
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index 08a8c1abe39..4c54c24fae6 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: authunix_prot.c,v 1.10 1999/09/16 11:45:22 lukem Exp $ */
+/* $NetBSD: authunix_prot.c,v 1.11 1999/09/20 04:39:20 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)authunix_prot.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: authunix_prot.c,v 1.10 1999/09/16 11:45:22 lukem Exp $");
+__RCSID("$NetBSD: authunix_prot.c,v 1.11 1999/09/20 04:39:20 lukem Exp $");
#endif
#endif
@@ -70,10 +70,6 @@ xdr_authunix_parms(xdrs, p)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(p != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || p == NULL)
- return (FALSE);
-#endif
if (xdr_u_long(xdrs, &(p->aup_time))
&& xdr_string(xdrs, &(p->aup_machname), MAX_MACHINE_NAME)
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 9dd0549a93d..d89d2f21a93 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_generic.c,v 1.13 1999/09/16 11:45:22 lukem Exp $ */
+/* $NetBSD: clnt_generic.c,v 1.14 1999/09/20 04:39:20 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
static char *sccsid = "@(#)clnt_generic.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: clnt_generic.c,v 1.13 1999/09/16 11:45:22 lukem Exp $");
+__RCSID("$NetBSD: clnt_generic.c,v 1.14 1999/09/20 04:39:20 lukem Exp $");
#endif
#endif
@@ -79,13 +79,6 @@ clnt_create(hostname, prog, vers, proto)
_DIAGASSERT(hostname != NULL);
_DIAGASSERT(proto != NULL);
-#ifdef _DIAGNOSTIC
- if (hostname == NULL || proto == NULL) {
- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
- rpc_createerr.cf_error.re_errno = EFAULT;
- return (NULL);
- }
-#endif
h = gethostbyname(hostname);
if (h == NULL) {
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index 5b8369a7051..d528aaf340f 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_perror.c,v 1.19 1999/09/17 00:21:12 lukem Exp $ */
+/* $NetBSD: clnt_perror.c,v 1.20 1999/09/20 04:39:20 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)clnt_perror.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: clnt_perror.c,v 1.19 1999/09/17 00:21:12 lukem Exp $");
+__RCSID("$NetBSD: clnt_perror.c,v 1.20 1999/09/20 04:39:20 lukem Exp $");
#endif
#endif
@@ -98,10 +98,6 @@ clnt_sperror(rpch, s)
_DIAGASSERT(rpch != NULL);
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (rpch == NULL || s == NULL)
- return (NULL);
-#endif
str = _buf();
if (str == 0)
@@ -188,13 +184,6 @@ clnt_perror(rpch, s)
_DIAGASSERT(rpch != NULL);
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (rpch == NULL || s == NULL) {
- (void) fprintf(stderr,
- "ERROR: clnt_perror() called with NULL argument\n");
- return;
- }
-#endif
(void) fprintf(stderr, "%s\n", clnt_sperror(rpch,s));
}
@@ -253,10 +242,6 @@ clnt_spcreateerror(s)
size_t len = buflen, i;
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL)
- return (NULL);
-#endif
str = _buf();
if (str == 0)
@@ -304,13 +289,6 @@ clnt_pcreateerror(s)
{
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL) {
- (void) fprintf(stderr,
- "ERROR: clnt_pcreateerror() called with NULL argument\n");
- return;
- }
-#endif
(void) fprintf(stderr, "%s\n", clnt_spcreateerror(s));
}
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index f94ea77c218..0596a8f91dc 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_simple.c,v 1.17 1999/09/16 11:45:22 lukem Exp $ */
+/* $NetBSD: clnt_simple.c,v 1.18 1999/09/20 04:39:21 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)clnt_simple.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: clnt_simple.c,v 1.17 1999/09/16 11:45:22 lukem Exp $");
+__RCSID("$NetBSD: clnt_simple.c,v 1.18 1999/09/20 04:39:21 lukem Exp $");
#endif
#endif
@@ -87,10 +87,6 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
_DIAGASSERT(host != NULL);
/* in may be NULL */
/* out may be NULL */
-#ifdef _DIAGNOSTIC
- if (host == NULL)
- return (0);
-#endif
if (crp == 0) {
crp = (struct callrpc_private *)calloc(1, sizeof (*crp));
diff --git a/lib/libc/rpc/clnt_tcp.c b/lib/libc/rpc/clnt_tcp.c
index ec7b743dcf3..83ce5229359 100644
--- a/lib/libc/rpc/clnt_tcp.c
+++ b/lib/libc/rpc/clnt_tcp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_tcp.c,v 1.19 1999/09/16 11:45:22 lukem Exp $ */
+/* $NetBSD: clnt_tcp.c,v 1.20 1999/09/20 04:39:21 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)clnt_tcp.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: clnt_tcp.c,v 1.19 1999/09/16 11:45:22 lukem Exp $");
+__RCSID("$NetBSD: clnt_tcp.c,v 1.20 1999/09/20 04:39:21 lukem Exp $");
#endif
#endif
@@ -151,13 +151,6 @@ clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
static u_int32_t disrupt;
_DIAGASSERT(sockp != NULL);
-#ifdef _DIAGNOSTIC
- if (sockp == NULL) {
- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
- rpc_createerr.cf_error.re_errno = EFAULT;
- return (NULL);
- }
-#endif
if (disrupt == 0)
disrupt = (u_int32_t)(long)raddr;
diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c
index 2b19ce6de12..8c35eb96e39 100644
--- a/lib/libc/rpc/clnt_udp.c
+++ b/lib/libc/rpc/clnt_udp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_udp.c,v 1.19 1999/09/16 11:45:23 lukem Exp $ */
+/* $NetBSD: clnt_udp.c,v 1.20 1999/09/20 04:39:21 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)clnt_udp.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: clnt_udp.c,v 1.19 1999/09/16 11:45:23 lukem Exp $");
+__RCSID("$NetBSD: clnt_udp.c,v 1.20 1999/09/20 04:39:21 lukem Exp $");
#endif
#endif
@@ -144,13 +144,6 @@ clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
_DIAGASSERT(raddr != NULL);
_DIAGASSERT(sockp != NULL);
-#ifdef _DIAGNOSTIC
- if (raddr == NULL || sockp == NULL) {
- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
- rpc_createerr.cf_error.re_errno = EFAULT;
- return (NULL);
- }
-#endif
if (disrupt == 0)
disrupt = (u_int32_t)(long)raddr;
diff --git a/lib/libc/rpc/get_myaddress.c b/lib/libc/rpc/get_myaddress.c
index abe185ad44d..f22482df68c 100644
--- a/lib/libc/rpc/get_myaddress.c
+++ b/lib/libc/rpc/get_myaddress.c
@@ -1,4 +1,4 @@
-/* $NetBSD: get_myaddress.c,v 1.9 1999/09/16 11:45:23 lukem Exp $ */
+/* $NetBSD: get_myaddress.c,v 1.10 1999/09/20 04:39:21 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)get_myaddress.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: get_myaddress.c,v 1.9 1999/09/16 11:45:23 lukem Exp $");
+__RCSID("$NetBSD: get_myaddress.c,v 1.10 1999/09/20 04:39:21 lukem Exp $");
#endif
#endif
@@ -67,10 +67,6 @@ get_myaddress(addr)
struct sockaddr_in *addr;
{
_DIAGASSERT(addr != NULL);
-#ifdef _DIAGNOSTIC
- if (addr == NULL)
- return (1);
-#endif
memset((void *) addr, 0, sizeof(*addr));
addr->sin_family = AF_INET;
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index 796e31f46f3..a02ed4a05da 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getrpcent.c,v 1.15 1999/09/16 11:45:23 lukem Exp $ */
+/* $NetBSD: getrpcent.c,v 1.16 1999/09/20 04:39:21 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
#if 0
static char *sccsid = "@(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";
#else
-__RCSID("$NetBSD: getrpcent.c,v 1.15 1999/09/16 11:45:23 lukem Exp $");
+__RCSID("$NetBSD: getrpcent.c,v 1.16 1999/09/20 04:39:21 lukem Exp $");
#endif
#endif
@@ -119,10 +119,6 @@ getrpcbyname(name)
char **rp;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return (NULL);
-#endif
setrpcent(0);
while ((rpc = getrpcent()) != NULL) {
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 021ef3eb18c..5226df8a3cc 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getrpcport.c,v 1.14 1999/09/16 11:45:23 lukem Exp $ */
+/* $NetBSD: getrpcport.c,v 1.15 1999/09/20 04:39:22 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)getrpcport.c 1.3 87/08/11 SMI";
static char *sccsid = "@(#)getrpcport.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: getrpcport.c,v 1.14 1999/09/16 11:45:23 lukem Exp $");
+__RCSID("$NetBSD: getrpcport.c,v 1.15 1999/09/20 04:39:22 lukem Exp $");
#endif
#endif
@@ -69,10 +69,6 @@ getrpcport(host, prognum, versnum, proto)
struct hostent *hp;
_DIAGASSERT(host != NULL);
-#ifdef _DIAGNOSTIC
- if (host == NULL)
- return (0);
-#endif
if ((hp = gethostbyname(host)) == NULL)
return (0);
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index d3ac556cb5a..e683e48717a 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_getmaps.c,v 1.13 1999/09/16 11:45:23 lukem Exp $ */
+/* $NetBSD: pmap_getmaps.c,v 1.14 1999/09/20 04:39:22 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_getmaps.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: pmap_getmaps.c,v 1.13 1999/09/16 11:45:23 lukem Exp $");
+__RCSID("$NetBSD: pmap_getmaps.c,v 1.14 1999/09/20 04:39:22 lukem Exp $");
#endif
#endif
@@ -86,10 +86,6 @@ pmap_getmaps(address)
CLIENT *client;
_DIAGASSERT(address != NULL);
-#ifdef _DIAGNOSTIC
- if (address == NULL)
- return (NULL);
-#endif
minutetimeout.tv_sec = 60;
minutetimeout.tv_usec = 0;
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index 9c38cd2acb5..393b964e90e 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_getport.c,v 1.13 1999/09/16 11:45:23 lukem Exp $ */
+/* $NetBSD: pmap_getport.c,v 1.14 1999/09/20 04:39:22 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_getport.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: pmap_getport.c,v 1.13 1999/09/16 11:45:23 lukem Exp $");
+__RCSID("$NetBSD: pmap_getport.c,v 1.14 1999/09/20 04:39:22 lukem Exp $");
#endif
#endif
@@ -85,10 +85,6 @@ pmap_getport(address, program, version, protocol)
struct pmap parms;
_DIAGASSERT(address != NULL);
-#ifdef _DIAGNOSTIC
- if (address == NULL)
- return (NULL);
-#endif
address->sin_port = htons(PMAPPORT);
client = clntudp_bufcreate(address, PMAPPROG,
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index a5dcb74fb3a..f18a020684e 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_prot.c,v 1.8 1999/09/16 11:45:23 lukem Exp $ */
+/* $NetBSD: pmap_prot.c,v 1.9 1999/09/20 04:39:22 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_prot.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: pmap_prot.c,v 1.8 1999/09/16 11:45:23 lukem Exp $");
+__RCSID("$NetBSD: pmap_prot.c,v 1.9 1999/09/20 04:39:22 lukem Exp $");
#endif
#endif
@@ -67,10 +67,6 @@ xdr_pmap(xdrs, regs)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(regs != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || regs == NULL)
- return (FALSE);
-#endif
if (xdr_u_long(xdrs, &regs->pm_prog) &&
xdr_u_long(xdrs, &regs->pm_vers) &&
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index 2f2b8f68832..b565d5753c2 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_prot2.c,v 1.10 1999/09/16 11:45:24 lukem Exp $ */
+/* $NetBSD: pmap_prot2.c,v 1.11 1999/09/20 04:39:22 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_prot2.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: pmap_prot2.c,v 1.10 1999/09/16 11:45:24 lukem Exp $");
+__RCSID("$NetBSD: pmap_prot2.c,v 1.11 1999/09/20 04:39:22 lukem Exp $");
#endif
#endif
@@ -112,10 +112,6 @@ xdr_pmaplist(xdrs, rp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(rp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || rp == NULL)
- return (FALSE);
-#endif
freeing = (xdrs->x_op == XDR_FREE);
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index b493f52832f..b45f0e9f497 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_rmt.c,v 1.22 1999/09/16 11:45:24 lukem Exp $ */
+/* $NetBSD: pmap_rmt.c,v 1.23 1999/09/20 04:39:23 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)pmap_rmt.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: pmap_rmt.c,v 1.22 1999/09/16 11:45:24 lukem Exp $");
+__RCSID("$NetBSD: pmap_rmt.c,v 1.23 1999/09/20 04:39:23 lukem Exp $");
#endif
#endif
@@ -108,12 +108,6 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout,
_DIAGASSERT(addr != NULL);
_DIAGASSERT(port_ptr != NULL);
-#ifdef _DIAGNOSTIC
- if (addr == NULL || port_ptr == NULL) {
- errno = EFAULT;
- return (RPC_SYSTEMERROR);
- }
-#endif
addr->sin_port = htons(PMAPPORT);
client = clntudp_create(addr, PMAPPROG, PMAPVERS, timeout, &sock);
@@ -151,10 +145,6 @@ xdr_rmtcall_args(xdrs, cap)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(cap != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || cap == NULL)
- return (FALSE);
-#endif
if (xdr_u_long(xdrs, &(cap->prog)) &&
xdr_u_long(xdrs, &(cap->vers)) &&
@@ -189,10 +179,6 @@ xdr_rmtcallres(xdrs, crp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(crp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || crp == NULL)
- return (FALSE);
-#endif
port_ptr = (caddr_t)(void *)crp->port_ptr;
if (xdr_reference(xdrs, &port_ptr, sizeof (u_long),
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index f942995875f..3cfb7704760 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_callmsg.c,v 1.13 1999/09/16 11:45:24 lukem Exp $ */
+/* $NetBSD: rpc_callmsg.c,v 1.14 1999/09/20 04:39:23 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)rpc_callmsg.c 2.1 88/07/29 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: rpc_callmsg.c,v 1.13 1999/09/16 11:45:24 lukem Exp $");
+__RCSID("$NetBSD: rpc_callmsg.c,v 1.14 1999/09/20 04:39:23 lukem Exp $");
#endif
#endif
@@ -73,10 +73,6 @@ xdr_callmsg(xdrs, cmsg)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(cmsg != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || cmsg == NULL)
- return (FALSE);
-#endif
if (xdrs->x_op == XDR_ENCODE) {
if (cmsg->rm_call.cb_cred.oa_length > MAX_AUTH_BYTES) {
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index d8d5d07e250..f7e491b0462 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc_prot.c,v 1.13 1999/09/16 11:45:24 lukem Exp $ */
+/* $NetBSD: rpc_prot.c,v 1.14 1999/09/20 04:39:23 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)rpc_prot.c 2.3 88/08/07 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: rpc_prot.c,v 1.13 1999/09/16 11:45:24 lukem Exp $");
+__RCSID("$NetBSD: rpc_prot.c,v 1.14 1999/09/20 04:39:23 lukem Exp $");
#endif
#endif
@@ -88,10 +88,6 @@ xdr_opaque_auth(xdrs, ap)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(ap != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || ap == NULL)
- return (FALSE);
-#endif
if (xdr_enum(xdrs, &(ap->oa_flavor)))
return (xdr_bytes(xdrs, &ap->oa_base,
@@ -110,10 +106,6 @@ xdr_des_block(xdrs, blkp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(blkp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || blkp == NULL)
- return (FALSE);
-#endif
return (xdr_opaque(xdrs, (caddr_t)(void *)blkp, sizeof(des_block)));
}
@@ -131,10 +123,6 @@ xdr_accepted_reply(xdrs, ar)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(ar != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || ar == NULL)
- return (FALSE);
-#endif
/* personalized union, rather than calling xdr_union */
if (! xdr_opaque_auth(xdrs, &(ar->ar_verf)))
@@ -171,10 +159,6 @@ xdr_rejected_reply(xdrs, rr)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(rr != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || rr == NULL)
- return (FALSE);
-#endif
/* personalized union, rather than calling xdr_union */
if (! xdr_enum(xdrs, (enum_t *)&(rr->rj_stat)))
@@ -208,10 +192,6 @@ xdr_replymsg(xdrs, rmsg)
{
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(rmsg != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || rmsg == NULL)
- return (FALSE);
-#endif
if (
xdr_u_int32_t(xdrs, &(rmsg->rm_xid)) &&
@@ -237,10 +217,6 @@ xdr_callhdr(xdrs, cmsg)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(cmsg != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || cmsg == NULL)
- return (FALSE);
-#endif
cmsg->rm_direction = CALL;
cmsg->rm_call.cb_rpcvers = RPC_MSG_VERSION;
@@ -332,10 +308,6 @@ _seterr_reply(msg, error)
_DIAGASSERT(msg != NULL);
_DIAGASSERT(error != NULL);
-#ifdef _DIAGNOSTIC
- if (msg == NULL || error == NULL)
- return;
-#endif
/* optimized for normal, SUCCESSful case */
switch (msg->rm_reply.rp_stat) {
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index b2f4b8cc327..4688b0e252c 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: svc.c,v 1.17 1999/09/16 11:45:24 lukem Exp $ */
+/* $NetBSD: svc.c,v 1.18 1999/09/20 04:39:24 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc.c 2.4 88/08/11 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: svc.c,v 1.17 1999/09/16 11:45:24 lukem Exp $");
+__RCSID("$NetBSD: svc.c,v 1.18 1999/09/20 04:39:24 lukem Exp $");
#endif
#endif
@@ -111,10 +111,6 @@ xprt_register(xprt)
int sock;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
sock = xprt->xp_sock;
@@ -142,10 +138,6 @@ xprt_unregister(xprt)
int sock;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
sock = xprt->xp_sock;
@@ -181,10 +173,6 @@ svc_register(xprt, prog, vers, dispatch, protocol)
_DIAGASSERT(xprt != NULL);
_DIAGASSERT(dispatch != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL || dispatch == NULL)
- return (FALSE);
-#endif
if ((s = svc_find(prog, vers, &prev)) != NULL_SVC) {
if (s->sc_dispatch == dispatch)
@@ -271,10 +259,6 @@ svc_sendreply(xprt, xdr_results, xdr_location)
struct rpc_msg rply;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return (FALSE);
-#endif
rply.rm_direction = REPLY;
rply.rm_reply.rp_stat = MSG_ACCEPTED;
@@ -295,10 +279,6 @@ svcerr_noproc(xprt)
struct rpc_msg rply;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
rply.rm_direction = REPLY;
rply.rm_reply.rp_stat = MSG_ACCEPTED;
@@ -317,10 +297,6 @@ svcerr_decode(xprt)
struct rpc_msg rply;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
rply.rm_direction = REPLY;
rply.rm_reply.rp_stat = MSG_ACCEPTED;
@@ -339,10 +315,6 @@ svcerr_systemerr(xprt)
struct rpc_msg rply;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
rply.rm_direction = REPLY;
rply.rm_reply.rp_stat = MSG_ACCEPTED;
@@ -362,10 +334,6 @@ svcerr_auth(xprt, why)
struct rpc_msg rply;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
rply.rm_direction = REPLY;
rply.rm_reply.rp_stat = MSG_DENIED;
@@ -383,10 +351,6 @@ svcerr_weakauth(xprt)
{
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
svcerr_auth(xprt, AUTH_TOOWEAK);
}
@@ -401,10 +365,6 @@ svcerr_noprog(xprt)
struct rpc_msg rply;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
rply.rm_direction = REPLY;
rply.rm_reply.rp_stat = MSG_ACCEPTED;
@@ -425,10 +385,6 @@ svcerr_progvers(xprt, low_vers, high_vers)
struct rpc_msg rply;
_DIAGASSERT(xprt != NULL);
-#ifdef _DIAGNOSTIC
- if (xprt == NULL)
- return;
-#endif
rply.rm_direction = REPLY;
rply.rm_reply.rp_stat = MSG_ACCEPTED;
@@ -488,10 +444,6 @@ svc_getreqset(readfds)
r.rq_clntcred = &(cred_area[2*MAX_AUTH_BYTES]);
_DIAGASSERT(readfds != NULL);
-#ifdef _DIAGNOSTIC
- if (readfds == NULL)
- return;
-#endif
maskp = readfds->fds_bits;
for (sock = 0; sock < FD_SETSIZE; sock += NFDBITS) {
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index 6909de9cebf..28ed79a9882 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_auth.c,v 1.9 1999/09/16 11:45:24 lukem Exp $ */
+/* $NetBSD: svc_auth.c,v 1.10 1999/09/20 04:39:24 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)svc_auth.c 1.19 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc_auth.c 2.1 88/08/07 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: svc_auth.c,v 1.9 1999/09/16 11:45:24 lukem Exp $");
+__RCSID("$NetBSD: svc_auth.c,v 1.10 1999/09/20 04:39:24 lukem Exp $");
#endif
#endif
@@ -103,10 +103,6 @@ _authenticate(rqst, msg)
_DIAGASSERT(rqst != NULL);
_DIAGASSERT(msg != NULL);
-#ifdef _DIAGNOSTIC
- if (rqst == NULL || msg == NULL)
- return (AUTH_FAILED);
-#endif
rqst->rq_cred = msg->rm_call.cb_cred;
rqst->rq_xprt->xp_verf.oa_flavor = _null_auth.oa_flavor;
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index 14f9da2398d..b47f7e82878 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_auth_unix.c,v 1.14 1999/09/16 11:45:24 lukem Exp $ */
+/* $NetBSD: svc_auth_unix.c,v 1.15 1999/09/20 04:39:24 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc_auth_unix.c 2.3 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: svc_auth_unix.c,v 1.14 1999/09/16 11:45:24 lukem Exp $");
+__RCSID("$NetBSD: svc_auth_unix.c,v 1.15 1999/09/20 04:39:24 lukem Exp $");
#endif
#endif
@@ -81,10 +81,6 @@ _svcauth_unix(rqst, msg)
_DIAGASSERT(rqst != NULL);
_DIAGASSERT(msg != NULL);
-#ifdef _DIAGNOSTIC
- if (rqst == NULL || msg == NULL)
- return (AUTH_FAILED);
-#endif
area = (struct area *) rqst->rq_clntcred;
aup = &area->area_aup;
diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c
index 164d3351cba..2ef72aa6107 100644
--- a/lib/libc/rpc/svc_tcp.c
+++ b/lib/libc/rpc/svc_tcp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_tcp.c,v 1.25 1999/09/16 17:03:46 sommerfeld Exp $ */
+/* $NetBSD: svc_tcp.c,v 1.26 1999/09/20 04:39:24 lukem Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
static char *sccsid = "@(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: svc_tcp.c,v 1.25 1999/09/16 17:03:46 sommerfeld Exp $");
+__RCSID("$NetBSD: svc_tcp.c,v 1.26 1999/09/20 04:39:24 lukem Exp $");
#endif
#endif
@@ -213,12 +213,6 @@ svcfd_create(fd, sendsize, recvsize)
{
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (NULL);
- }
-#endif
return (makefd_xprt(fd, sendsize, recvsize));
}
@@ -349,10 +343,6 @@ readtcp(xprtp, buf, len)
_DIAGASSERT(xprt != NULL);
sock = xprt->xp_sock;
-#ifdef _DIAGNOSTIC
- if (buf == NULL)
- goto fatal_err;
-#endif
do {
pollfd.fd = sock;
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
index 7450bc16724..434eafbd0e5 100644
--- a/lib/libc/stdio/asprintf.c
+++ b/lib/libc/stdio/asprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asprintf.c,v 1.5 1999/09/16 11:45:25 lukem Exp $ */
+/* $NetBSD: asprintf.c,v 1.6 1999/09/20 04:39:25 lukem Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: asprintf.c,v 1.5 1999/09/16 11:45:25 lukem Exp $");
+__RCSID("$NetBSD: asprintf.c,v 1.6 1999/09/20 04:39:25 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -58,12 +58,6 @@ asprintf(str, fmt, va_alist)
unsigned char *_base;
_DIAGASSERT(str != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
#if __STDC__
va_start(ap, fmt);
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
index 2ab047c5ab9..7a9af10e3d4 100644
--- a/lib/libc/stdio/clrerr.c
+++ b/lib/libc/stdio/clrerr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clrerr.c,v 1.7 1999/09/16 11:45:25 lukem Exp $ */
+/* $NetBSD: clrerr.c,v 1.8 1999/09/20 04:39:25 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)clrerr.c 8.1 (Berkeley) 6/4/93";
#endif
-__RCSID("$NetBSD: clrerr.c,v 1.7 1999/09/16 11:45:25 lukem Exp $");
+__RCSID("$NetBSD: clrerr.c,v 1.8 1999/09/20 04:39:25 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -55,10 +55,6 @@ clearerr(fp)
FILE *fp;
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL)
- return;
-#endif
FLOCKFILE(fp);
__sclearerr(fp);
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
index 38564848726..2d982915036 100644
--- a/lib/libc/stdio/fclose.c
+++ b/lib/libc/stdio/fclose.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fclose.c,v 1.11 1999/09/16 11:45:25 lukem Exp $ */
+/* $NetBSD: fclose.c,v 1.12 1999/09/20 04:39:25 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fclose.c 8.1 (Berkeley) 6/4/93";
#endif
-__RCSID("$NetBSD: fclose.c,v 1.11 1999/09/16 11:45:25 lukem Exp $");
+__RCSID("$NetBSD: fclose.c,v 1.12 1999/09/20 04:39:25 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -58,12 +58,6 @@ fclose(fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
FLOCKFILE(fp);
if (fp->_flags == 0) { /* not open! */
diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c
index c56b3d184b6..3ac6d97bfb7 100644
--- a/lib/libc/stdio/fdopen.c
+++ b/lib/libc/stdio/fdopen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdopen.c,v 1.9 1999/09/16 11:45:25 lukem Exp $ */
+/* $NetBSD: fdopen.c,v 1.10 1999/09/20 04:39:25 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fdopen.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fdopen.c,v 1.9 1999/09/16 11:45:25 lukem Exp $");
+__RCSID("$NetBSD: fdopen.c,v 1.10 1999/09/20 04:39:25 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,12 +69,6 @@ fdopen(fd, mode)
int flags, oflags, fdflags, tmp;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (NULL);
- }
-#endif
if ((flags = __sflags(mode, &oflags)) == 0)
return (NULL);
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
index dfef725f64f..2f0b8b9c277 100644
--- a/lib/libc/stdio/feof.c
+++ b/lib/libc/stdio/feof.c
@@ -1,4 +1,4 @@
-/* $NetBSD: feof.c,v 1.8 1999/09/16 11:45:26 lukem Exp $ */
+/* $NetBSD: feof.c,v 1.9 1999/09/20 04:39:26 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)feof.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: feof.c,v 1.8 1999/09/16 11:45:26 lukem Exp $");
+__RCSID("$NetBSD: feof.c,v 1.9 1999/09/20 04:39:26 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,10 +61,6 @@ feof(fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL)
- return (0);
-#endif
FLOCKFILE(fp);
r = __sfeof(fp);
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
index de0edfea3c6..2ca098086b4 100644
--- a/lib/libc/stdio/ferror.c
+++ b/lib/libc/stdio/ferror.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ferror.c,v 1.8 1999/09/16 11:45:26 lukem Exp $ */
+/* $NetBSD: ferror.c,v 1.9 1999/09/20 04:39:26 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ferror.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: ferror.c,v 1.8 1999/09/16 11:45:26 lukem Exp $");
+__RCSID("$NetBSD: ferror.c,v 1.9 1999/09/20 04:39:26 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,10 +61,6 @@ ferror(fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL)
- return (0);
-#endif
FLOCKFILE(fp);
r = __sferror(fp);
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index 12cbad78990..f88ecbd0703 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fflush.c,v 1.12 1999/09/16 11:45:26 lukem Exp $ */
+/* $NetBSD: fflush.c,v 1.13 1999/09/20 04:39:26 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fflush.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fflush.c,v 1.12 1999/09/16 11:45:26 lukem Exp $");
+__RCSID("$NetBSD: fflush.c,v 1.13 1999/09/20 04:39:26 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -88,10 +88,6 @@ __sflush(fp)
int n, t;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL)
- return (0);
-#endif
t = fp->_flags;
if ((t & __SWR) == 0)
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
index 814aaf5bd33..1fa4340b586 100644
--- a/lib/libc/stdio/fgetc.c
+++ b/lib/libc/stdio/fgetc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fgetc.c,v 1.8 1999/09/16 11:45:26 lukem Exp $ */
+/* $NetBSD: fgetc.c,v 1.9 1999/09/20 04:39:26 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fgetc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fgetc.c,v 1.8 1999/09/16 11:45:26 lukem Exp $");
+__RCSID("$NetBSD: fgetc.c,v 1.9 1999/09/20 04:39:26 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -57,12 +57,6 @@ fgetc(fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
FLOCKFILE(fp);
r = __sgetc(fp);
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
index 329d07fe65a..af376aeb1a7 100644
--- a/lib/libc/stdio/fgetln.c
+++ b/lib/libc/stdio/fgetln.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fgetln.c,v 1.8 1999/09/16 11:45:26 lukem Exp $ */
+/* $NetBSD: fgetln.c,v 1.9 1999/09/20 04:39:26 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fgetline.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fgetln.c,v 1.8 1999/09/16 11:45:26 lukem Exp $");
+__RCSID("$NetBSD: fgetln.c,v 1.9 1999/09/20 04:39:26 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -78,10 +78,6 @@ __slbexpand(fp, newsize)
++newsize;
#endif
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL)
- return (-1);
-#endif
if (fp->_lb._size >= newsize)
return (0);
@@ -110,10 +106,6 @@ fgetln(fp, lenp)
_DIAGASSERT(fp != NULL);
_DIAGASSERT(lenp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL || lenp == NULL)
- return (NULL);
-#endif
FLOCKFILE(fp);
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
index 5e5a980f308..bcc9d5b7f2f 100644
--- a/lib/libc/stdio/fgetpos.c
+++ b/lib/libc/stdio/fgetpos.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fgetpos.c,v 1.8 1999/09/16 11:45:26 lukem Exp $ */
+/* $NetBSD: fgetpos.c,v 1.9 1999/09/20 04:39:26 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fgetpos.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fgetpos.c,v 1.8 1999/09/16 11:45:26 lukem Exp $");
+__RCSID("$NetBSD: fgetpos.c,v 1.9 1999/09/20 04:39:26 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,12 +56,6 @@ fgetpos(fp, pos)
{
_DIAGASSERT(fp != NULL);
_DIAGASSERT(pos != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL || pos == NULL) {
- errno = EBADF;
- return (1);
- }
-#endif
return((*pos = ftell(fp)) == (fpos_t)-1);
}
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index 715f8b04b5e..ecd87a37849 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fgets.c,v 1.11 1999/09/16 11:45:26 lukem Exp $ */
+/* $NetBSD: fgets.c,v 1.12 1999/09/20 04:39:27 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fgets.c 8.2 (Berkeley) 12/22/93";
#else
-__RCSID("$NetBSD: fgets.c,v 1.11 1999/09/16 11:45:26 lukem Exp $");
+__RCSID("$NetBSD: fgets.c,v 1.12 1999/09/20 04:39:27 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -68,10 +68,6 @@ fgets(buf, n, fp)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL || fp == NULL)
- return (NULL);
-#endif
if (n <= 0) /* sanity check */
return (NULL);
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
index 115eef54ecf..8900aa14531 100644
--- a/lib/libc/stdio/fileno.c
+++ b/lib/libc/stdio/fileno.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fileno.c,v 1.8 1999/09/16 11:45:26 lukem Exp $ */
+/* $NetBSD: fileno.c,v 1.9 1999/09/20 04:39:27 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fileno.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fileno.c,v 1.8 1999/09/16 11:45:26 lukem Exp $");
+__RCSID("$NetBSD: fileno.c,v 1.9 1999/09/20 04:39:27 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ fileno(fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (-1);
- }
-#endif
FLOCKFILE(fp);
r = __sfileno(fp);
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
index 9aebf37d169..49704d74a71 100644
--- a/lib/libc/stdio/flags.c
+++ b/lib/libc/stdio/flags.c
@@ -1,4 +1,4 @@
-/* $NetBSD: flags.c,v 1.10 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: flags.c,v 1.11 1999/09/20 04:39:27 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)flags.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: flags.c,v 1.10 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: flags.c,v 1.11 1999/09/20 04:39:27 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,10 +65,6 @@ __sflags(mode, optr)
int ret, m, o;
_DIAGASSERT(mode != NULL);
-#ifdef _DIAGNOSTIC
- if (mode == NULL)
- return (0);
-#endif
switch (*mode++) {
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
index 3ad6a1ff3e4..a7c7ab7d67d 100644
--- a/lib/libc/stdio/fopen.c
+++ b/lib/libc/stdio/fopen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fopen.c,v 1.7 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: fopen.c,v 1.8 1999/09/20 04:39:27 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fopen.c,v 1.7 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: fopen.c,v 1.8 1999/09/20 04:39:27 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,6 @@ fopen(file, mode)
int flags, oflags;
_DIAGASSERT(file != NULL);
-#ifdef _DIAGNOSTIC
- if (file == NULL)
- return (NULL);
-#endif
if ((flags = __sflags(mode, &oflags)) == 0)
return (NULL);
if ((fp = __sfp()) == NULL)
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
index 130b2e639c8..dc6850f7707 100644
--- a/lib/libc/stdio/fprintf.c
+++ b/lib/libc/stdio/fprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fprintf.c,v 1.7 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: fprintf.c,v 1.8 1999/09/20 04:39:27 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fprintf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fprintf.c,v 1.7 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: fprintf.c,v 1.8 1999/09/20 04:39:27 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,16 +69,6 @@ fprintf(fp, fmt, va_alist)
_DIAGASSERT(fp != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (-1);
- }
- if (fmt == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
#if __STDC__
va_start(ap, fmt);
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
index 6e1c4109e32..78a6e67aa85 100644
--- a/lib/libc/stdio/fpurge.c
+++ b/lib/libc/stdio/fpurge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpurge.c,v 1.8 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: fpurge.c,v 1.9 1999/09/20 04:39:28 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fpurge.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fpurge.c,v 1.8 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: fpurge.c,v 1.9 1999/09/20 04:39:28 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ fpurge(fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
FLOCKFILE(fp);
if (!fp->_flags) {
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
index 3706048cb04..dc20583a4c1 100644
--- a/lib/libc/stdio/fputc.c
+++ b/lib/libc/stdio/fputc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fputc.c,v 1.9 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: fputc.c,v 1.10 1999/09/20 04:39:28 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fputc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fputc.c,v 1.9 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: fputc.c,v 1.10 1999/09/20 04:39:28 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,12 +58,6 @@ fputc(c, fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
FLOCKFILE(fp);
r = __sputc(c, fp);
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index 8f80c1ae2b4..95323c80fa2 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fputs.c,v 1.9 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: fputs.c,v 1.10 1999/09/20 04:39:28 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fputs.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fputs.c,v 1.9 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: fputs.c,v 1.10 1999/09/20 04:39:28 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -66,16 +66,6 @@ fputs(s, fp)
_DIAGASSERT(s != NULL);
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL) {
- errno = EFAULT;
- return (EOF);
- }
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
/* LINTED we don't touch s */
iov.iov_base = (void *)s;
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
index 5145efb28ac..9d83c395565 100644
--- a/lib/libc/stdio/fread.c
+++ b/lib/libc/stdio/fread.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fread.c,v 1.12 1999/09/17 13:03:46 lukem Exp $ */
+/* $NetBSD: fread.c,v 1.13 1999/09/20 04:39:28 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fread.c 8.2 (Berkeley) 12/11/93";
#else
-__RCSID("$NetBSD: fread.c,v 1.12 1999/09/17 13:03:46 lukem Exp $");
+__RCSID("$NetBSD: fread.c,v 1.13 1999/09/20 04:39:28 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,16 +65,6 @@ fread(buf, size, count, fp)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL) {
- errno = EFAULT;
- return (0);
- }
- if (fp == NULL) {
- errno = EBADF;
- return (0);
- }
-#endif
/*
* The ANSI standard requires a return value of 0 for a count
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
index f5ad7cd459a..f61678b4304 100644
--- a/lib/libc/stdio/freopen.c
+++ b/lib/libc/stdio/freopen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: freopen.c,v 1.9 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: freopen.c,v 1.10 1999/09/20 04:39:28 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)freopen.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: freopen.c,v 1.9 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: freopen.c,v 1.10 1999/09/20 04:39:28 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,20 +72,6 @@ freopen(file, mode, fp)
_DIAGASSERT(file != NULL);
_DIAGASSERT(mode != NULL);
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (file == NULL || *file == '\0') {
- errno = ENOENT;
- return (NULL);
- }
- if (mode == NULL) {
- errno = EFAULT;
- return (NULL);
- }
- if (fp == NULL) {
- errno = EBADF;
- return (NULL);
- }
-#endif
if ((flags = __sflags(mode, &oflags)) == 0) {
(void) fclose(fp);
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
index 2c2ad190001..33ef68ef238 100644
--- a/lib/libc/stdio/fscanf.c
+++ b/lib/libc/stdio/fscanf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fscanf.c,v 1.7 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: fscanf.c,v 1.8 1999/09/20 04:39:28 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fscanf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fscanf.c,v 1.7 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: fscanf.c,v 1.8 1999/09/20 04:39:28 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,16 +72,6 @@ fscanf(fp, fmt, va_alist)
_DIAGASSERT(fp != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
- if (fmt == NULL) {
- errno = EFAULT;
- return (EOF);
- }
-#endif
va_start(ap);
#endif
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index a890dae043a..ba9ba959e0a 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fseek.c,v 1.17 1999/09/16 11:45:27 lukem Exp $ */
+/* $NetBSD: fseek.c,v 1.18 1999/09/20 04:39:29 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fseek.c 8.3 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: fseek.c,v 1.17 1999/09/16 11:45:27 lukem Exp $");
+__RCSID("$NetBSD: fseek.c,v 1.18 1999/09/20 04:39:29 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -75,12 +75,6 @@ fseek(fp, offset, whence)
int havepos;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (-1);
- }
-#endif
#ifdef __GNUC__
/* This outrageous construct just to shut up a GCC warning. */
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
index 3c29f7455a5..25d8c197078 100644
--- a/lib/libc/stdio/fsetpos.c
+++ b/lib/libc/stdio/fsetpos.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fsetpos.c,v 1.7 1999/09/16 11:45:28 lukem Exp $ */
+/* $NetBSD: fsetpos.c,v 1.8 1999/09/20 04:39:29 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fsetpos.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fsetpos.c,v 1.7 1999/09/16 11:45:28 lukem Exp $");
+__RCSID("$NetBSD: fsetpos.c,v 1.8 1999/09/20 04:39:29 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,16 +59,6 @@ fsetpos(iop, pos)
{
_DIAGASSERT(iop != NULL);
_DIAGASSERT(pos != NULL);
-#ifdef _DIAGNOSTIC
- if (iop == NULL) {
- errno = EBADF;
- return (-1);
- }
- if (pos == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
return (fseek(iop, (long)*pos, SEEK_SET));
}
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index 6b157d4151a..8a90f3b0ae4 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ftell.c,v 1.12 1999/09/16 11:45:28 lukem Exp $ */
+/* $NetBSD: ftell.c,v 1.13 1999/09/20 04:39:29 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ftell.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: ftell.c,v 1.12 1999/09/16 11:45:28 lukem Exp $");
+__RCSID("$NetBSD: ftell.c,v 1.13 1999/09/20 04:39:29 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,13 +60,6 @@ ftell(fp)
{
fpos_t pos;
-#ifdef _DIAGNOSTIC
- _DIAGASSERT(fp != NULL);
- if (fp == NULL) {
- errno = EBADF;
- return (-1);
- }
-#endif
FLOCKFILE(fp);
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
index bc043f5ecb3..abf44f675ca 100644
--- a/lib/libc/stdio/fvwrite.c
+++ b/lib/libc/stdio/fvwrite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fvwrite.c,v 1.12 1999/09/16 11:45:28 lukem Exp $ */
+/* $NetBSD: fvwrite.c,v 1.13 1999/09/20 04:39:29 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fvwrite.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fvwrite.c,v 1.12 1999/09/16 11:45:28 lukem Exp $");
+__RCSID("$NetBSD: fvwrite.c,v 1.13 1999/09/20 04:39:29 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -73,16 +73,6 @@ __sfvwrite(fp, uio)
_DIAGASSERT(fp != NULL);
_DIAGASSERT(uio != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
- if (uio == NULL) {
- errno = EFAULT;
- return (EOF);
- }
-#endif
if ((len = uio->uio_resid) == 0)
return (0);
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
index c2f891c5f4d..dc2ed57357c 100644
--- a/lib/libc/stdio/fwalk.c
+++ b/lib/libc/stdio/fwalk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwalk.c,v 1.8 1999/09/16 11:45:28 lukem Exp $ */
+/* $NetBSD: fwalk.c,v 1.9 1999/09/20 04:39:29 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fwalk.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fwalk.c,v 1.8 1999/09/16 11:45:28 lukem Exp $");
+__RCSID("$NetBSD: fwalk.c,v 1.9 1999/09/20 04:39:29 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,12 +60,6 @@ _fwalk(function)
struct glue *g;
_DIAGASSERT(function != NULL);
-#ifdef _DIAGNOSTIC
- if (function == NULL) {
- errno = EFAULT;
- return EOF;
- }
-#endif
ret = 0;
for (g = &__sglue; g != NULL; g = g->next)
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
index 40b51ecdd55..0d45807bd2e 100644
--- a/lib/libc/stdio/fwrite.c
+++ b/lib/libc/stdio/fwrite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwrite.c,v 1.11 1999/09/17 13:03:46 lukem Exp $ */
+/* $NetBSD: fwrite.c,v 1.12 1999/09/20 04:39:30 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)fwrite.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fwrite.c,v 1.11 1999/09/17 13:03:46 lukem Exp $");
+__RCSID("$NetBSD: fwrite.c,v 1.12 1999/09/20 04:39:30 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -68,16 +68,6 @@ fwrite(buf, size, count, fp)
_DIAGASSERT(buf != NULL);
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL) {
- errno = EFAULT;
- return (0);
- }
- if (fp == NULL) {
- errno = EBADF;
- return (0);
- }
-#endif
/* LINTED we don't play with buf */
iov.iov_base = (void *)buf;
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
index 5f3c8e72386..fe4cffb8ff6 100644
--- a/lib/libc/stdio/getc.c
+++ b/lib/libc/stdio/getc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getc.c,v 1.8 1999/09/16 11:45:28 lukem Exp $ */
+/* $NetBSD: getc.c,v 1.9 1999/09/20 04:39:30 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getc.c,v 1.8 1999/09/16 11:45:28 lukem Exp $");
+__RCSID("$NetBSD: getc.c,v 1.9 1999/09/20 04:39:30 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,12 +63,6 @@ getc(fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
FLOCKFILE(fp);
r = __sgetc(fp);
@@ -82,12 +76,6 @@ getc_unlocked(fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
return (__sgetc(fp));
}
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index ffcd44021ac..d9cfe647c15 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gets.c,v 1.12 1999/09/16 11:45:28 lukem Exp $ */
+/* $NetBSD: gets.c,v 1.13 1999/09/20 04:39:30 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)gets.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: gets.c,v 1.12 1999/09/16 11:45:28 lukem Exp $");
+__RCSID("$NetBSD: gets.c,v 1.13 1999/09/20 04:39:30 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,12 +60,6 @@ gets(buf)
char *s;
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL) {
- errno = EBADF;
- return (NULL);
- }
-#endif
FLOCKFILE(stdin);
for (s = buf; (c = getchar_unlocked()) != '\n'; ) {
diff --git a/lib/libc/stdio/gettemp.c b/lib/libc/stdio/gettemp.c
index 59cc8203e21..8102debc5cc 100644
--- a/lib/libc/stdio/gettemp.c
+++ b/lib/libc/stdio/gettemp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gettemp.c,v 1.4 1999/09/16 11:45:28 lukem Exp $ */
+/* $NetBSD: gettemp.c,v 1.5 1999/09/20 04:39:30 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: gettemp.c,v 1.4 1999/09/16 11:45:28 lukem Exp $");
+__RCSID("$NetBSD: gettemp.c,v 1.5 1999/09/20 04:39:30 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -73,12 +73,6 @@ __gettemp(path, doopen, domkdir)
_DIAGASSERT(path != NULL);
/* doopen may be NULL */
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (NULL);
- }
-#endif
pid = getpid();
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
index 3184ccab24c..cfd628c0270 100644
--- a/lib/libc/stdio/getw.c
+++ b/lib/libc/stdio/getw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getw.c,v 1.7 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: getw.c,v 1.8 1999/09/20 04:39:30 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getw.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getw.c,v 1.7 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: getw.c,v 1.8 1999/09/20 04:39:30 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,12 +56,6 @@ getw(fp)
int x;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
return (fread((void *)&x, sizeof(x), 1, fp) == 1 ? x : EOF);
}
diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c
index 42988faa69c..77cbd93e63f 100644
--- a/lib/libc/stdio/makebuf.c
+++ b/lib/libc/stdio/makebuf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: makebuf.c,v 1.11 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: makebuf.c,v 1.12 1999/09/20 04:39:30 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)makebuf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: makebuf.c,v 1.11 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: makebuf.c,v 1.12 1999/09/20 04:39:30 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,10 +72,6 @@ __smakebuf(fp)
int couldbetty;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL)
- return;
-#endif
if (fp->_flags & __SNBF) {
fp->_bf._base = fp->_p = fp->_nbuf;
@@ -112,10 +108,6 @@ __swhatbuf(fp, bufsize, couldbetty)
_DIAGASSERT(fp != NULL);
_DIAGASSERT(bufsize != NULL);
_DIAGASSERT(couldbetty != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL || bufsize == NULL || couldbetty == NULL)
- return (__SNPT);
-#endif
if (fp->_file < 0 || fstat(fp->_file, &st) < 0) {
*couldbetty = 0;
diff --git a/lib/libc/stdio/mkdtemp.c b/lib/libc/stdio/mkdtemp.c
index 628226cc278..3aa6be1d70e 100644
--- a/lib/libc/stdio/mkdtemp.c
+++ b/lib/libc/stdio/mkdtemp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdtemp.c,v 1.2 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: mkdtemp.c,v 1.3 1999/09/20 04:39:31 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: mkdtemp.c,v 1.2 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: mkdtemp.c,v 1.3 1999/09/20 04:39:31 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -54,12 +54,6 @@ mkdtemp(path)
char *path;
{
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (NULL);
- }
-#endif
return (__gettemp(path, (int *)NULL, 1) ? path : (char *)NULL);
}
diff --git a/lib/libc/stdio/mkstemp.c b/lib/libc/stdio/mkstemp.c
index 366876be23b..7ea719c9ef4 100644
--- a/lib/libc/stdio/mkstemp.c
+++ b/lib/libc/stdio/mkstemp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkstemp.c,v 1.3 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: mkstemp.c,v 1.4 1999/09/20 04:39:31 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: mkstemp.c,v 1.3 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: mkstemp.c,v 1.4 1999/09/20 04:39:31 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,12 +56,6 @@ mkstemp(path)
int fd;
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (NULL);
- }
-#endif
return (__gettemp(path, &fd, 0) ? fd : -1);
}
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 7c7b632450d..031d9ecb6e0 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mktemp.c,v 1.16 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: mktemp.c,v 1.17 1999/09/20 04:39:31 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: mktemp.c,v 1.16 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: mktemp.c,v 1.17 1999/09/20 04:39:31 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -55,12 +55,6 @@ _mktemp(path)
{
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (NULL);
- }
-#endif
return (__gettemp(path, (int *)NULL, 0) ? path : (char *)NULL);
}
@@ -74,12 +68,6 @@ mktemp(path)
{
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (NULL);
- }
-#endif
return (__gettemp(path, (int *)NULL, 0) ? path : (char *)NULL);
}
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
index f745cbbf298..aab554ccc5b 100644
--- a/lib/libc/stdio/printf.c
+++ b/lib/libc/stdio/printf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.7 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: printf.c,v 1.8 1999/09/20 04:39:31 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: printf.c,v 1.7 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: printf.c,v 1.8 1999/09/20 04:39:31 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -66,13 +66,6 @@ printf(fmt, va_alist)
int ret;
va_list ap;
-#ifdef _DIAGNOSTIC
- _DIAGASSERT(fmt != NULL);
- if (fmt == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
#if __STDC__
va_start(ap, fmt);
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
index 79ce90b4e61..81c0cdb089c 100644
--- a/lib/libc/stdio/putc.c
+++ b/lib/libc/stdio/putc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: putc.c,v 1.8 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: putc.c,v 1.9 1999/09/20 04:39:31 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)putc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: putc.c,v 1.8 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: putc.c,v 1.9 1999/09/20 04:39:31 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -64,12 +64,6 @@ putc(c, fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
FLOCKFILE(fp);
r = __sputc(c, fp);
@@ -84,12 +78,6 @@ putc_unlocked(c, fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
return (__sputc(c, fp));
}
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 52c01ded91e..6b17548f2ca 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -1,4 +1,4 @@
-/* $NetBSD: puts.c,v 1.9 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: puts.c,v 1.10 1999/09/20 04:39:31 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)puts.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: puts.c,v 1.9 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: puts.c,v 1.10 1999/09/20 04:39:31 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,12 +65,6 @@ puts(s)
int r;
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
/* LINTED we don't touch the string */
iov[0].iov_base = (void *)s;
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index d0560ce0971..41fa159e29b 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: putw.c,v 1.8 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: putw.c,v 1.9 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)putw.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: putw.c,v 1.8 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: putw.c,v 1.9 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,12 +61,6 @@ putw(w, fp)
int r;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
iov.iov_base = &w;
iov.iov_len = uio.uio_resid = sizeof(w);
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
index 70c719f60c8..ca24f6aa58a 100644
--- a/lib/libc/stdio/refill.c
+++ b/lib/libc/stdio/refill.c
@@ -1,4 +1,4 @@
-/* $NetBSD: refill.c,v 1.10 1999/09/16 11:45:29 lukem Exp $ */
+/* $NetBSD: refill.c,v 1.11 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)refill.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: refill.c,v 1.10 1999/09/16 11:45:29 lukem Exp $");
+__RCSID("$NetBSD: refill.c,v 1.11 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -80,12 +80,6 @@ __srefill(fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
/* make sure stdio is set up */
if (!__sdidinit)
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
index e2f0b78846f..7d24eab04c1 100644
--- a/lib/libc/stdio/remove.c
+++ b/lib/libc/stdio/remove.c
@@ -1,4 +1,4 @@
-/* $NetBSD: remove.c,v 1.11 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: remove.c,v 1.12 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)remove.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: remove.c,v 1.11 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: remove.c,v 1.12 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,12 +60,6 @@ remove(file)
struct stat sb;
_DIAGASSERT(file != NULL);
-#ifdef _DIAGNOSTIC
- if (file == NULL || *file == '\0') {
- errno = ENOENT;
- return (-1);
- }
-#endif
if (lstat(file, &sb) < 0)
return (-1);
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index 2fe4cff1368..04629e57d3c 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rewind.c,v 1.9 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: rewind.c,v 1.10 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)rewind.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: rewind.c,v 1.9 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: rewind.c,v 1.10 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,12 +56,6 @@ rewind(fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return;
- }
-#endif
FLOCKFILE(fp);
(void) fseek(fp, 0L, SEEK_SET);
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
index 5c9fa4b1d25..db97c0e42f1 100644
--- a/lib/libc/stdio/rget.c
+++ b/lib/libc/stdio/rget.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rget.c,v 1.8 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: rget.c,v 1.9 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)rget.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: rget.c,v 1.8 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: rget.c,v 1.9 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,12 +61,6 @@ __srget(fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
if (__srefill(fp) == 0) {
fp->_r--;
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
index 84a8a353801..37be2b6c32a 100644
--- a/lib/libc/stdio/scanf.c
+++ b/lib/libc/stdio/scanf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scanf.c,v 1.7 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: scanf.c,v 1.8 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)scanf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: scanf.c,v 1.7 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: scanf.c,v 1.8 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -67,12 +67,6 @@ scanf(fmt, va_alist)
va_list ap;
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (fmt == NULL) {
- errno = EFAULT;
- return (EOF);
- }
-#endif
#if __STDC__
va_start(ap, fmt);
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
index 1c235b3c091..eaa4348dafa 100644
--- a/lib/libc/stdio/setbuf.c
+++ b/lib/libc/stdio/setbuf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setbuf.c,v 1.6 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: setbuf.c,v 1.7 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)setbuf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: setbuf.c,v 1.6 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: setbuf.c,v 1.7 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,12 +58,6 @@ setbuf(fp, buf)
_DIAGASSERT(fp != NULL);
/* buf may be NULL */
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return;
- }
-#endif
(void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
}
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
index 8648b0ac457..00e970fd1e6 100644
--- a/lib/libc/stdio/setbuffer.c
+++ b/lib/libc/stdio/setbuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setbuffer.c,v 1.8 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: setbuffer.c,v 1.9 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)setbuffer.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: setbuffer.c,v 1.8 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: setbuffer.c,v 1.9 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,12 +58,6 @@ setbuffer(fp, buf, size)
_DIAGASSERT(fp != NULL);
/* buf may be NULL */
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return;
- }
-#endif
(void)setvbuf(fp, buf, buf ? _IOFBF : _IONBF, (size_t)size);
}
@@ -77,12 +71,6 @@ setlinebuf(fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
return (setvbuf(fp, (char *)NULL, _IOLBF, (size_t)0));
}
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
index 59785123e93..ee9c81246be 100644
--- a/lib/libc/stdio/setvbuf.c
+++ b/lib/libc/stdio/setvbuf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setvbuf.c,v 1.13 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: setvbuf.c,v 1.14 1999/09/20 04:39:32 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93";
#else
-__RCSID("$NetBSD: setvbuf.c,v 1.13 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: setvbuf.c,v 1.14 1999/09/20 04:39:32 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -69,12 +69,6 @@ setvbuf(fp, buf, mode, size)
_DIAGASSERT(fp != NULL);
/* buf may be NULL */
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
/*
* Verify arguments. The `int' limit on `size' is due to this
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
index 136ffdf629b..540afda1b67 100644
--- a/lib/libc/stdio/snprintf.c
+++ b/lib/libc/stdio/snprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: snprintf.c,v 1.9 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: snprintf.c,v 1.10 1999/09/20 04:39:33 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: snprintf.c,v 1.9 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: snprintf.c,v 1.10 1999/09/20 04:39:33 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -77,12 +77,6 @@ snprintf(str, n, fmt, va_alist)
_DIAGASSERT(str != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL || fmt == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if ((int)n < 1)
return (-1);
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
index fa08a6fb068..ff910e4f78d 100644
--- a/lib/libc/stdio/sprintf.c
+++ b/lib/libc/stdio/sprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sprintf.c,v 1.7 1999/09/16 11:45:30 lukem Exp $ */
+/* $NetBSD: sprintf.c,v 1.8 1999/09/20 04:39:33 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: sprintf.c,v 1.7 1999/09/16 11:45:30 lukem Exp $");
+__RCSID("$NetBSD: sprintf.c,v 1.8 1999/09/20 04:39:33 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,12 +72,6 @@ sprintf(str, fmt, va_alist)
_DIAGASSERT(str != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL || fmt == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *)str;
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
index ede6b8ff084..f0b8972c9d0 100644
--- a/lib/libc/stdio/sscanf.c
+++ b/lib/libc/stdio/sscanf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sscanf.c,v 1.10 1999/09/16 11:45:31 lukem Exp $ */
+/* $NetBSD: sscanf.c,v 1.11 1999/09/20 04:39:33 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)sscanf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: sscanf.c,v 1.10 1999/09/16 11:45:31 lukem Exp $");
+__RCSID("$NetBSD: sscanf.c,v 1.11 1999/09/20 04:39:33 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -85,12 +85,6 @@ sscanf(str, fmt, va_alist)
_DIAGASSERT(str != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL || fmt == NULL) {
- errno = EFAULT;
- return (EOF);
- }
-#endif
f._flags = __SRD;
/* LINTED we don't touch the string */
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
index 7e7cbd704ef..b86a25ec59b 100644
--- a/lib/libc/stdio/stdio.c
+++ b/lib/libc/stdio/stdio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.c,v 1.10 1999/09/16 11:45:31 lukem Exp $ */
+/* $NetBSD: stdio.c,v 1.11 1999/09/20 04:39:33 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)stdio.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: stdio.c,v 1.10 1999/09/16 11:45:31 lukem Exp $");
+__RCSID("$NetBSD: stdio.c,v 1.11 1999/09/20 04:39:33 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,16 +70,6 @@ __sread(cookie, buf, n)
_DIAGASSERT(fp != NULL);
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (-1);
- }
- if (buf == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
ret = read(fp->_file, buf, (size_t)n);
/* if the read succeeded, update the current offset */
@@ -100,16 +90,6 @@ __swrite(cookie, buf, n)
_DIAGASSERT(cookie != NULL);
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (-1);
- }
- if (buf == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (fp->_flags & __SAPP)
(void) lseek(fp->_file, (off_t)0, SEEK_END);
@@ -127,12 +107,6 @@ __sseek(cookie, offset, whence)
off_t ret;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (-1);
- }
-#endif
ret = lseek(fp->_file, (off_t)offset, whence);
if (ret == -1L)
@@ -150,12 +124,6 @@ __sclose(cookie)
{
_DIAGASSERT(cookie != NULL);
-#ifdef _DIAGNOSTIC
- if (cookie == NULL) {
- errno = EBADF;
- return (-1);
- }
-#endif
return (close(((FILE *)cookie)->_file));
}
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index 6698ba4cfd4..4391deb9a2a 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ungetc.c,v 1.10 1999/09/16 11:45:31 lukem Exp $ */
+/* $NetBSD: ungetc.c,v 1.11 1999/09/20 04:39:33 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)ungetc.c 8.2 (Berkeley) 11/3/93";
#else
-__RCSID("$NetBSD: ungetc.c,v 1.10 1999/09/16 11:45:31 lukem Exp $");
+__RCSID("$NetBSD: ungetc.c,v 1.11 1999/09/20 04:39:33 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -102,12 +102,6 @@ ungetc(c, fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
if (c == EOF)
return (EOF);
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
index 52cd79791d4..302535071c4 100644
--- a/lib/libc/stdio/vasprintf.c
+++ b/lib/libc/stdio/vasprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vasprintf.c,v 1.5 1999/09/16 11:45:31 lukem Exp $ */
+/* $NetBSD: vasprintf.c,v 1.6 1999/09/20 04:39:33 lukem Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vasprintf.c,v 1.5 1999/09/16 11:45:31 lukem Exp $");
+__RCSID("$NetBSD: vasprintf.c,v 1.6 1999/09/20 04:39:33 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -49,12 +49,6 @@ vasprintf(str, fmt, ap)
_DIAGASSERT(str != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL || fmt == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
f._flags = __SWR | __SSTR | __SALC;
f._bf._base = f._p = (unsigned char *)malloc(128);
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index b76e9080d0a..a8134ca5ad6 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfprintf.c,v 1.31 1999/09/16 11:45:31 lukem Exp $ */
+/* $NetBSD: vfprintf.c,v 1.32 1999/09/20 04:39:33 lukem Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -41,7 +41,7 @@
#if 0
static char *sccsid = "@(#)vfprintf.c 5.50 (Berkeley) 12/16/92";
#else
-__RCSID("$NetBSD: vfprintf.c,v 1.31 1999/09/16 11:45:31 lukem Exp $");
+__RCSID("$NetBSD: vfprintf.c,v 1.32 1999/09/20 04:39:33 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -289,16 +289,6 @@ vfprintf(fp, fmt0, ap)
_DIAGASSERT(fp != NULL);
_DIAGASSERT(fmt0 != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (-1);
- }
- if (fmt0 == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
FLOCKFILE(fp);
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index 1709485bf7d..f81ed6d40eb 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfscanf.c,v 1.23 1999/09/16 11:45:31 lukem Exp $ */
+/* $NetBSD: vfscanf.c,v 1.24 1999/09/20 04:39:34 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vfscanf.c,v 1.23 1999/09/16 11:45:31 lukem Exp $");
+__RCSID("$NetBSD: vfscanf.c,v 1.24 1999/09/20 04:39:34 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -135,16 +135,6 @@ __svfscanf(fp, fmt0, ap)
_DIAGASSERT(fp != NULL);
_DIAGASSERT(fmt0 != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
- if (fmt0 == NULL) {
- errno = EFAULT;
- return (EOF);
- }
-#endif
nassigned = 0;
nread = 0;
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
index c6b465cf60d..1c651da8801 100644
--- a/lib/libc/stdio/vprintf.c
+++ b/lib/libc/stdio/vprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vprintf.c,v 1.8 1999/09/16 11:45:32 lukem Exp $ */
+/* $NetBSD: vprintf.c,v 1.9 1999/09/20 04:39:34 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)vprintf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vprintf.c,v 1.8 1999/09/16 11:45:32 lukem Exp $");
+__RCSID("$NetBSD: vprintf.c,v 1.9 1999/09/20 04:39:34 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,12 +56,6 @@ vprintf(fmt, ap)
{
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (fmt == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
return (vfprintf(stdout, fmt, ap));
}
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
index fa9c2a63901..e76c6d63795 100644
--- a/lib/libc/stdio/vscanf.c
+++ b/lib/libc/stdio/vscanf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vscanf.c,v 1.8 1999/09/16 11:45:32 lukem Exp $ */
+/* $NetBSD: vscanf.c,v 1.9 1999/09/20 04:39:34 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)vscanf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vscanf.c,v 1.8 1999/09/16 11:45:32 lukem Exp $");
+__RCSID("$NetBSD: vscanf.c,v 1.9 1999/09/20 04:39:34 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,12 +56,6 @@ vscanf(fmt, ap)
{
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (fmt == NULL) {
- errno = EFAULT;
- return (EOF);
- }
-#endif
return (__svfscanf(stdin, fmt, ap));
}
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
index 1c611142430..8f740ed722c 100644
--- a/lib/libc/stdio/vsnprintf.c
+++ b/lib/libc/stdio/vsnprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vsnprintf.c,v 1.10 1999/09/16 11:45:32 lukem Exp $ */
+/* $NetBSD: vsnprintf.c,v 1.11 1999/09/20 04:39:34 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vsnprintf.c,v 1.10 1999/09/16 11:45:32 lukem Exp $");
+__RCSID("$NetBSD: vsnprintf.c,v 1.11 1999/09/20 04:39:34 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -67,12 +67,6 @@ vsnprintf(str, n, fmt, ap)
_DIAGASSERT(str != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL || fmt == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if ((int)n < 1)
return (-1);
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
index 3675f272f7e..21947e62c5e 100644
--- a/lib/libc/stdio/vsprintf.c
+++ b/lib/libc/stdio/vsprintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vsprintf.c,v 1.8 1999/09/16 11:45:32 lukem Exp $ */
+/* $NetBSD: vsprintf.c,v 1.9 1999/09/20 04:39:34 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)vsprintf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vsprintf.c,v 1.8 1999/09/16 11:45:32 lukem Exp $");
+__RCSID("$NetBSD: vsprintf.c,v 1.9 1999/09/20 04:39:34 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,12 +61,6 @@ vsprintf(str, fmt, ap)
_DIAGASSERT(str != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL || fmt == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *)str;
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
index f65817afacf..c2730dc27e3 100644
--- a/lib/libc/stdio/vsscanf.c
+++ b/lib/libc/stdio/vsscanf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vsscanf.c,v 1.9 1999/09/16 11:45:32 lukem Exp $ */
+/* $NetBSD: vsscanf.c,v 1.10 1999/09/20 04:39:35 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)vsscanf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: vsscanf.c,v 1.9 1999/09/16 11:45:32 lukem Exp $");
+__RCSID("$NetBSD: vsscanf.c,v 1.10 1999/09/20 04:39:35 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -72,12 +72,6 @@ vsscanf(str, fmt, ap)
_DIAGASSERT(str != NULL);
_DIAGASSERT(fmt != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL || fmt == NULL) {
- errno = EFAULT;
- return (EOF);
- }
-#endif
f._flags = __SRD;
/* LINTED we don't touch str */
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index 994b2036657..23acbe33161 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wbuf.c,v 1.9 1999/09/16 11:45:32 lukem Exp $ */
+/* $NetBSD: wbuf.c,v 1.10 1999/09/20 04:39:35 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wbuf.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: wbuf.c,v 1.9 1999/09/16 11:45:32 lukem Exp $");
+__RCSID("$NetBSD: wbuf.c,v 1.10 1999/09/20 04:39:35 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,12 +63,6 @@ __swbuf(c, fp)
int n;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
/*
* In case we cannot write, or longjmp takes us out early,
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
index 41a7a61547c..5dde455de5d 100644
--- a/lib/libc/stdio/wsetup.c
+++ b/lib/libc/stdio/wsetup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsetup.c,v 1.8 1999/09/16 11:45:32 lukem Exp $ */
+/* $NetBSD: wsetup.c,v 1.9 1999/09/20 04:39:35 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)wsetup.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: wsetup.c,v 1.8 1999/09/16 11:45:32 lukem Exp $");
+__RCSID("$NetBSD: wsetup.c,v 1.9 1999/09/20 04:39:35 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ __swsetup(fp)
{
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return (EOF);
- }
-#endif
/* make sure stdio is set up */
if (!__sdidinit)
diff --git a/lib/libc/stdlib/_rand48.c b/lib/libc/stdlib/_rand48.c
index 859c41ed4e4..8276a6e8ecb 100644
--- a/lib/libc/stdlib/_rand48.c
+++ b/lib/libc/stdlib/_rand48.c
@@ -1,4 +1,4 @@
-/* $NetBSD: _rand48.c,v 1.5 1999/09/16 11:45:32 lukem Exp $ */
+/* $NetBSD: _rand48.c,v 1.6 1999/09/20 04:39:35 lukem Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -36,10 +36,6 @@ __dorand48(unsigned short xseed[3])
unsigned short temp[2];
_DIAGASSERT(xseed != NULL);
-#ifdef _DIAGNOSTIC
- if (xseed == NULL)
- return;
-#endif
accu = (unsigned long) __rand48_mult[0] * (unsigned long) xseed[0] +
(unsigned long) __rand48_add;
diff --git a/lib/libc/stdlib/a64l.c b/lib/libc/stdlib/a64l.c
index fe97ec721b6..0f879931c2f 100644
--- a/lib/libc/stdlib/a64l.c
+++ b/lib/libc/stdlib/a64l.c
@@ -5,7 +5,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: a64l.c,v 1.6 1999/09/16 11:45:33 lukem Exp $");
+__RCSID("$NetBSD: a64l.c,v 1.7 1999/09/20 04:39:36 lukem Exp $");
#endif
#include "namespace.h"
@@ -25,10 +25,6 @@ a64l(s)
int i;
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL)
- return (0L);
-#endif
value = 0;
shift = 0;
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
index e4843119fe9..f907824a604 100644
--- a/lib/libc/stdlib/atexit.c
+++ b/lib/libc/stdlib/atexit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atexit.c,v 1.11 1999/09/16 11:45:33 lukem Exp $ */
+/* $NetBSD: atexit.c,v 1.12 1999/09/20 04:39:36 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)atexit.c 8.2 (Berkeley) 7/3/94";
#else
-__RCSID("$NetBSD: atexit.c,v 1.11 1999/09/16 11:45:33 lukem Exp $");
+__RCSID("$NetBSD: atexit.c,v 1.12 1999/09/20 04:39:36 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -68,12 +68,6 @@ atexit(fn)
struct atexit *p;
_DIAGASSERT(fn != NULL);
-#ifdef _DIAGNOSTIC
- if (fn == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
mutex_lock(&__atexit_mutex);
if ((p = __atexit) == NULL)
diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c
index 0bac542caa8..ba628a5d881 100644
--- a/lib/libc/stdlib/atof.c
+++ b/lib/libc/stdlib/atof.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atof.c,v 1.10 1999/09/16 11:45:33 lukem Exp $ */
+/* $NetBSD: atof.c,v 1.11 1999/09/20 04:39:36 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)atof.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: atof.c,v 1.10 1999/09/16 11:45:33 lukem Exp $");
+__RCSID("$NetBSD: atof.c,v 1.11 1999/09/20 04:39:36 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -50,10 +50,6 @@ atof(ascii)
const char *ascii;
{
_DIAGASSERT(ascii != NULL);
-#ifdef _DIAGNOSTIC
- if (ascii == NULL)
- return ((double)0);
-#endif
return (strtod(ascii, NULL));
}
diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c
index 07123ad2c25..c27d1d9c215 100644
--- a/lib/libc/stdlib/atoi.c
+++ b/lib/libc/stdlib/atoi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atoi.c,v 1.9 1999/09/16 11:45:33 lukem Exp $ */
+/* $NetBSD: atoi.c,v 1.10 1999/09/20 04:39:36 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)atoi.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: atoi.c,v 1.9 1999/09/16 11:45:33 lukem Exp $");
+__RCSID("$NetBSD: atoi.c,v 1.10 1999/09/20 04:39:36 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -50,10 +50,6 @@ atoi(str)
const char *str;
{
_DIAGASSERT(str != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL)
- return (0);
-#endif
return((int)strtol(str, (char **)NULL, 10));
}
diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c
index 1b78743782c..085f8030a60 100644
--- a/lib/libc/stdlib/atol.c
+++ b/lib/libc/stdlib/atol.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atol.c,v 1.8 1999/09/16 11:45:33 lukem Exp $ */
+/* $NetBSD: atol.c,v 1.9 1999/09/20 04:39:36 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)atol.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: atol.c,v 1.8 1999/09/16 11:45:33 lukem Exp $");
+__RCSID("$NetBSD: atol.c,v 1.9 1999/09/20 04:39:36 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -50,10 +50,6 @@ atol(str)
const char *str;
{
_DIAGASSERT(str != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL)
- return (0L);
-#endif
return(strtol(str, (char **)NULL, 10));
}
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index aec06d30f75..cf7b8363ffc 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bsearch.c,v 1.10 1999/09/16 11:45:33 lukem Exp $ */
+/* $NetBSD: bsearch.c,v 1.11 1999/09/20 04:39:36 lukem Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)bsearch.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bsearch.c,v 1.10 1999/09/16 11:45:33 lukem Exp $");
+__RCSID("$NetBSD: bsearch.c,v 1.11 1999/09/20 04:39:36 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -78,12 +78,6 @@ bsearch(key, base0, nmemb, size, compar)
_DIAGASSERT(key != NULL);
_DIAGASSERT(base0 != NULL);
_DIAGASSERT(compar != NULL);
-#ifdef _DIAGNOSTIC
- if (key == NULL || base0 == NULL || compar == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
for (lim = nmemb; lim != 0; lim >>= 1) {
p = base + (lim >> 1) * size;
diff --git a/lib/libc/stdlib/erand48.c b/lib/libc/stdlib/erand48.c
index ccdd8801310..976eaa4816c 100644
--- a/lib/libc/stdlib/erand48.c
+++ b/lib/libc/stdlib/erand48.c
@@ -1,4 +1,4 @@
-/* $NetBSD: erand48.c,v 1.5 1999/09/16 11:45:33 lukem Exp $ */
+/* $NetBSD: erand48.c,v 1.6 1999/09/20 04:39:37 lukem Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -28,10 +28,6 @@ erand48(unsigned short xseed[3])
{
_DIAGASSERT(xseed != NULL);
-#ifdef _DIAGNOSTIC
- if (xseed == NULL)
- return ((double)0);
-#endif
__dorand48(xseed);
return ldexp((double) xseed[0], -48) +
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index a3c9928d351..a0873ccd123 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getenv.c,v 1.13 1999/09/16 11:45:33 lukem Exp $ */
+/* $NetBSD: getenv.c,v 1.14 1999/09/20 04:39:37 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getenv.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getenv.c,v 1.13 1999/09/16 11:45:33 lukem Exp $");
+__RCSID("$NetBSD: getenv.c,v 1.14 1999/09/20 04:39:37 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,12 +65,6 @@ getenv(name)
char *result;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
rwlock_rdlock(&__environ_lock);
result = __findenv(name, &offset);
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
index 3a262a3c274..a4420e5babd 100644
--- a/lib/libc/stdlib/getopt.c
+++ b/lib/libc/stdlib/getopt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getopt.c,v 1.14 1999/09/16 11:45:34 lukem Exp $ */
+/* $NetBSD: getopt.c,v 1.15 1999/09/20 04:39:37 lukem Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: getopt.c,v 1.14 1999/09/16 11:45:34 lukem Exp $");
+__RCSID("$NetBSD: getopt.c,v 1.15 1999/09/20 04:39:37 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,13 +81,6 @@ getopt(nargc, nargv, ostr)
_DIAGASSERT(nargv != NULL);
_DIAGASSERT(ostr != NULL);
-#ifdef _DIAGNOSTIC
- if (nargv == NULL || ostr == NULL) {
- errno = EFAULT;
- place = EMSG;
- return (-1);
- }
-#endif
if (optreset || !*place) { /* update scanning pointer */
optreset = 0;
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 9a5e70ec152..adf62c11755 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -84,13 +84,6 @@ getopt_internal(nargc, nargv, ostr)
_DIAGASSERT(nargv != NULL);
_DIAGASSERT(ostr != NULL);
-#ifdef _DIAGNOSTIC
- if (nargv == NULL || ostr == NULL) {
- errno = EFAULT;
- place = EMSG;
- return (-1);
- }
-#endif
if (optreset || !*place) { /* update scanning pointer */
optreset = 0;
@@ -180,12 +173,6 @@ getopt_long(nargc, nargv, options, long_options, index)
_DIAGASSERT(ostr != NULL);
_DIAGASSERT(long_options != NULL);
/* index may be NULL */
-#ifdef _DIAGNOSTIC
- if (nargv == NULL || ostr == NULL || long_options) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
char *current_argv = nargv[optind++] + 2, *has_equal;
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
index 5abe50a15fa..17c1a5c3837 100644
--- a/lib/libc/stdlib/getsubopt.c
+++ b/lib/libc/stdlib/getsubopt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getsubopt.c,v 1.5 1999/09/16 11:45:34 lukem Exp $ */
+/* $NetBSD: getsubopt.c,v 1.6 1999/09/20 04:39:37 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)getsubopt.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getsubopt.c,v 1.5 1999/09/16 11:45:34 lukem Exp $");
+__RCSID("$NetBSD: getsubopt.c,v 1.6 1999/09/20 04:39:37 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -66,10 +66,6 @@ getsubopt(optionp, tokens, valuep)
_DIAGASSERT(valuep != NULL);
_DIAGASSERT(tokens != NULL);
/* optionp is tested below */
-#ifdef _DIAGNOSTIC
- if (valuep == NULL || tokens == NULL)
- return (-1);
-#endif
suboptarg = *valuep = NULL;
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index 5a8bef039c0..593622c124e 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: heapsort.c,v 1.10 1999/09/16 11:45:34 lukem Exp $ */
+/* $NetBSD: heapsort.c,v 1.11 1999/09/20 04:39:37 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "from: @(#)heapsort.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: heapsort.c,v 1.10 1999/09/16 11:45:34 lukem Exp $");
+__RCSID("$NetBSD: heapsort.c,v 1.11 1999/09/20 04:39:37 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -163,12 +163,6 @@ heapsort(vbase, nmemb, size, compar)
_DIAGASSERT(vbase != NULL);
_DIAGASSERT(compar != NULL);
-#ifdef _DIAGNOSTIC
- if (vbase == NULL || compar == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (nmemb <= 1)
return (0);
diff --git a/lib/libc/stdlib/jrand48.c b/lib/libc/stdlib/jrand48.c
index 5b655611273..448574902da 100644
--- a/lib/libc/stdlib/jrand48.c
+++ b/lib/libc/stdlib/jrand48.c
@@ -1,4 +1,4 @@
-/* $NetBSD: jrand48.c,v 1.5 1999/09/16 11:45:34 lukem Exp $ */
+/* $NetBSD: jrand48.c,v 1.6 1999/09/20 04:39:38 lukem Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -28,10 +28,6 @@ jrand48(unsigned short xseed[3])
{
_DIAGASSERT(xseed != NULL);
-#ifdef _DIAGNOSTIC
- if (xseed == NULL)
- return (0L);
-#endif
__dorand48(xseed);
return ((long) xseed[2] << 16) + (long) xseed[1];
diff --git a/lib/libc/stdlib/l64a.c b/lib/libc/stdlib/l64a.c
index 5c7826054dd..3b41a0351a5 100644
--- a/lib/libc/stdlib/l64a.c
+++ b/lib/libc/stdlib/l64a.c
@@ -1,4 +1,4 @@
-/* $NetBSD: l64a.c,v 1.10 1999/09/16 11:45:34 lukem Exp $ */
+/* $NetBSD: l64a.c,v 1.11 1999/09/20 04:39:38 lukem Exp $ */
/*
* Written by J.T. Conklin <jtc@netbsd.org>.
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: l64a.c,v 1.10 1999/09/16 11:45:34 lukem Exp $");
+__RCSID("$NetBSD: l64a.c,v 1.11 1999/09/20 04:39:38 lukem Exp $");
#endif
#include "namespace.h"
@@ -42,12 +42,6 @@ l64a_r (value, buffer, buflen)
unsigned long v = value;
_DIAGASSERT(buffer != NULL);
-#ifdef _DIAGNOSTIC
- if (buffer == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (value == 0UL)
goto out;
diff --git a/lib/libc/stdlib/lcong48.c b/lib/libc/stdlib/lcong48.c
index 7f1e101d136..07b848010b2 100644
--- a/lib/libc/stdlib/lcong48.c
+++ b/lib/libc/stdlib/lcong48.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lcong48.c,v 1.5 1999/09/16 11:45:34 lukem Exp $ */
+/* $NetBSD: lcong48.c,v 1.6 1999/09/20 04:39:38 lukem Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -27,10 +27,6 @@ void
lcong48(unsigned short p[7])
{
_DIAGASSERT(p != NULL);
-#ifdef _DIAGNOSTIC
- if (p == NULL)
- return;
-#endif
__rand48_seed[0] = p[0];
__rand48_seed[1] = p[1];
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 21fb4c57829..07912d7196a 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: merge.c,v 1.8 1999/09/16 11:45:35 lukem Exp $ */
+/* $NetBSD: merge.c,v 1.9 1999/09/20 04:39:40 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "from: @(#)merge.c 8.2 (Berkeley) 2/14/94";
#else
-__RCSID("$NetBSD: merge.c,v 1.8 1999/09/16 11:45:35 lukem Exp $");
+__RCSID("$NetBSD: merge.c,v 1.9 1999/09/20 04:39:40 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -125,12 +125,6 @@ mergesort(base, nmemb, size, cmp)
_DIAGASSERT(base != NULL);
_DIAGASSERT(cmp != NULL);
-#ifdef _DIAGNOSTIC
- if (base == NULL || cmp == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (size < PSIZE / 2) { /* Pointers must fit into 2 * size. */
errno = EINVAL;
diff --git a/lib/libc/stdlib/multibyte.c b/lib/libc/stdlib/multibyte.c
index 13ca5cafb8b..b3e67820d39 100644
--- a/lib/libc/stdlib/multibyte.c
+++ b/lib/libc/stdlib/multibyte.c
@@ -1,4 +1,4 @@
-/* $NetBSD: multibyte.c,v 1.7 1999/09/16 11:45:35 lukem Exp $ */
+/* $NetBSD: multibyte.c,v 1.8 1999/09/20 04:39:40 lukem Exp $ */
/*
* Copyright (c) 1991 The Regents of the University of California.
@@ -38,7 +38,7 @@
#if 0
static char *sccsid = "from: @(#)multibyte.c 5.1 (Berkeley) 2/18/91";
#else
-__RCSID("$NetBSD: multibyte.c,v 1.7 1999/09/16 11:45:35 lukem Exp $");
+__RCSID("$NetBSD: multibyte.c,v 1.8 1999/09/20 04:39:40 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -108,10 +108,6 @@ mbstowcs(pwcs, s, n)
_DIAGASSERT(pwcs != NULL);
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (pwcs == NULL || s == NULL)
- return (0);
-#endif
if (n != 0) {
do {
diff --git a/lib/libc/stdlib/nrand48.c b/lib/libc/stdlib/nrand48.c
index dcc4ac61f26..db0eba78df4 100644
--- a/lib/libc/stdlib/nrand48.c
+++ b/lib/libc/stdlib/nrand48.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nrand48.c,v 1.6 1999/09/16 11:45:35 lukem Exp $ */
+/* $NetBSD: nrand48.c,v 1.7 1999/09/20 04:39:40 lukem Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -27,10 +27,6 @@ long
nrand48(unsigned short xseed[3])
{
_DIAGASSERT(xseed != NULL);
-#ifdef _DIAGNOSTIC
- if (xseed == NULL)
- return (0L);
-#endif
__dorand48(xseed);
return (long)((unsigned long) xseed[2] << 15) +
diff --git a/lib/libc/stdlib/putenv.c b/lib/libc/stdlib/putenv.c
index 0a6cfcbacb1..fb05fdb81cc 100644
--- a/lib/libc/stdlib/putenv.c
+++ b/lib/libc/stdlib/putenv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: putenv.c,v 1.9 1999/09/16 11:45:35 lukem Exp $ */
+/* $NetBSD: putenv.c,v 1.10 1999/09/20 04:39:40 lukem Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)putenv.c 8.2 (Berkeley) 3/27/94";
#else
-__RCSID("$NetBSD: putenv.c,v 1.9 1999/09/16 11:45:35 lukem Exp $");
+__RCSID("$NetBSD: putenv.c,v 1.10 1999/09/20 04:39:40 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,12 +61,6 @@ putenv(str)
int rval;
_DIAGASSERT(str != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if ((p = strdup(str)) == NULL)
return (-1);
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 9088228c31b..d8e9ff42e3c 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qsort.c,v 1.11 1999/09/16 11:45:35 lukem Exp $ */
+/* $NetBSD: qsort.c,v 1.12 1999/09/20 04:39:40 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)qsort.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: qsort.c,v 1.11 1999/09/16 11:45:35 lukem Exp $");
+__RCSID("$NetBSD: qsort.c,v 1.12 1999/09/20 04:39:40 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -114,12 +114,6 @@ qsort(a, n, es, cmp)
_DIAGASSERT(a != NULL);
_DIAGASSERT(cmp != NULL);
-#ifdef _DIAGNOSTIC
- if (n == 0)
- return;
- if (a == NULL || cmp == NULL)
- return;
-#endif
loop: SWAPINIT(a, es);
swap_cnt = 0;
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 99d731a917f..84ceaabe766 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radixsort.c,v 1.12 1999/09/16 11:45:35 lukem Exp $ */
+/* $NetBSD: radixsort.c,v 1.13 1999/09/20 04:39:41 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)radixsort.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: radixsort.c,v 1.12 1999/09/16 11:45:35 lukem Exp $");
+__RCSID("$NetBSD: radixsort.c,v 1.13 1999/09/20 04:39:41 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -115,12 +115,6 @@ radixsort(a, n, tab, endch)
_DIAGASSERT(a != NULL);
_DIAGASSERT(tab != NULL);
-#ifdef _DIAGNOSTIC
- if (a == NULL || tab == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
SETUP;
r_sort_a(a, n, 0, tr, endch);
diff --git a/lib/libc/stdlib/rand_r.c b/lib/libc/stdlib/rand_r.c
index d5e58d8fb29..176ea6608b7 100644
--- a/lib/libc/stdlib/rand_r.c
+++ b/lib/libc/stdlib/rand_r.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rand_r.c,v 1.3 1999/09/16 11:45:35 lukem Exp $ */
+/* $NetBSD: rand_r.c,v 1.4 1999/09/20 04:39:41 lukem Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
#if 0
static char *sccsid = "from: @(#)rand.c 5.6 (Berkeley) 6/24/91";
#else
-__RCSID("$NetBSD: rand_r.c,v 1.3 1999/09/16 11:45:35 lukem Exp $");
+__RCSID("$NetBSD: rand_r.c,v 1.4 1999/09/20 04:39:41 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -51,10 +51,6 @@ rand_r(seed)
unsigned int *seed;
{
_DIAGASSERT(seed != NULL);
-#ifdef _DIAGNOSTIC
- if (seed == NULL)
- return (0);
-#endif
return ((*seed = *seed * 1103515245 + 12345) & RAND_MAX);
}
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
index 567aee14f66..db845e94fe4 100644
--- a/lib/libc/stdlib/random.c
+++ b/lib/libc/stdlib/random.c
@@ -1,4 +1,4 @@
-/* $NetBSD: random.c,v 1.17 1999/09/16 11:45:35 lukem Exp $ */
+/* $NetBSD: random.c,v 1.18 1999/09/20 04:39:41 lukem Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)random.c 8.2 (Berkeley) 5/19/95";
#else
-__RCSID("$NetBSD: random.c,v 1.17 1999/09/16 11:45:35 lukem Exp $");
+__RCSID("$NetBSD: random.c,v 1.18 1999/09/20 04:39:41 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -299,10 +299,6 @@ initstate(seed, arg_state, n)
long *long_arg_state;
_DIAGASSERT(arg_state != NULL);
-#ifdef _DIAGNOSTIC
- if (arg_state == NULL)
- return (NULL);
-#endif
long_arg_state = (long *)(void *)arg_state;
@@ -375,10 +371,6 @@ setstate(arg_state)
void *ostate = (void *)(&state[-1]);
_DIAGASSERT(arg_state != NULL);
-#ifdef _DIAGNOSTIC
- if (arg_state == NULL)
- return (NULL);
-#endif
new_state = (long *)(void *)arg_state;
type = (int)(new_state[0] % MAX_TYPES);
diff --git a/lib/libc/stdlib/seed48.c b/lib/libc/stdlib/seed48.c
index 4c45b25a732..7b51ea7cfee 100644
--- a/lib/libc/stdlib/seed48.c
+++ b/lib/libc/stdlib/seed48.c
@@ -1,4 +1,4 @@
-/* $NetBSD: seed48.c,v 1.5 1999/09/16 11:45:36 lukem Exp $ */
+/* $NetBSD: seed48.c,v 1.6 1999/09/20 04:39:41 lukem Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -29,10 +29,6 @@ seed48(unsigned short xseed[3])
static unsigned short sseed[3];
_DIAGASSERT(xseed != NULL);
-#ifdef _DIAGNOSTIC
- if (xseed == NULL)
- return (NULL);
-#endif
sseed[0] = __rand48_seed[0];
sseed[1] = __rand48_seed[1];
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
index 7a43cc15637..f6cbd193ce8 100644
--- a/lib/libc/stdlib/setenv.c
+++ b/lib/libc/stdlib/setenv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setenv.c,v 1.16 1999/09/16 11:45:36 lukem Exp $ */
+/* $NetBSD: setenv.c,v 1.17 1999/09/20 04:39:42 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)setenv.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: setenv.c,v 1.16 1999/09/16 11:45:36 lukem Exp $");
+__RCSID("$NetBSD: setenv.c,v 1.17 1999/09/20 04:39:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -79,12 +79,6 @@ setenv(name, value, rewrite)
_DIAGASSERT(name != NULL);
_DIAGASSERT(value != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL || value == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (*value == '=') /* no `=' in value */
++value;
@@ -153,10 +147,6 @@ unsetenv(name)
int offset;
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (name == NULL)
- return;
-#endif
rwlock_wrlock(&__environ_lock);
while (__findenv(name, &offset)) /* if set multiple times */
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
index c1a6ca5ad4d..f0b0304e4aa 100644
--- a/lib/libc/stdlib/strtol.c
+++ b/lib/libc/stdlib/strtol.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strtol.c,v 1.14 1999/09/16 11:45:36 lukem Exp $ */
+/* $NetBSD: strtol.c,v 1.15 1999/09/20 04:39:42 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strtol.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strtol.c,v 1.14 1999/09/16 11:45:36 lukem Exp $");
+__RCSID("$NetBSD: strtol.c,v 1.15 1999/09/20 04:39:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -68,12 +68,6 @@ strtol(nptr, endptr, base)
_DIAGASSERT(nptr != NULL);
/* endptr may be NULL */
-#ifdef _DIAGNOSTIC
- if (nptr == NULL) {
- errno = EFAULT;
- return (0);
- }
-#endif
/*
* Skip white space and pick up leading +/- sign if any.
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
index d3429964d1c..bb627c8c5ad 100644
--- a/lib/libc/stdlib/strtoq.c
+++ b/lib/libc/stdlib/strtoq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strtoq.c,v 1.13 1999/09/16 11:45:36 lukem Exp $ */
+/* $NetBSD: strtoq.c,v 1.14 1999/09/20 04:39:42 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strtoq.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strtoq.c,v 1.13 1999/09/16 11:45:36 lukem Exp $");
+__RCSID("$NetBSD: strtoq.c,v 1.14 1999/09/20 04:39:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -74,12 +74,6 @@ _strtoq(nptr, endptr, base)
_DIAGASSERT(nptr != NULL);
/* endptr may be NULL */
-#ifdef _DIAGNOSTIC
- if (nptr == NULL) {
- errno = EFAULT;
- return ((quad_t)0);
- }
-#endif
#ifdef __GNUC__
/* This outrageous construct just to shut up a GCC warning. */
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
index 7bd1a599ca9..63c544dfe15 100644
--- a/lib/libc/stdlib/strtoul.c
+++ b/lib/libc/stdlib/strtoul.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strtoul.c,v 1.14 1999/09/16 11:45:36 lukem Exp $ */
+/* $NetBSD: strtoul.c,v 1.15 1999/09/20 04:39:42 lukem Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strtoul.c,v 1.14 1999/09/16 11:45:36 lukem Exp $");
+__RCSID("$NetBSD: strtoul.c,v 1.15 1999/09/20 04:39:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -67,12 +67,6 @@ strtoul(nptr, endptr, base)
_DIAGASSERT(nptr != NULL);
/* endptr may be NULL */
-#ifdef _DIAGNOSTIC
- if (nptr == NULL) {
- errno = EFAULT;
- return ((unsigned long)0);
- }
-#endif
/*
* See strtol for comments as to the logic used.
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
index 32a56f801ee..9db625fba44 100644
--- a/lib/libc/stdlib/strtouq.c
+++ b/lib/libc/stdlib/strtouq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strtouq.c,v 1.12 1999/09/16 11:45:36 lukem Exp $ */
+/* $NetBSD: strtouq.c,v 1.13 1999/09/20 04:39:42 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strtouq.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strtouq.c,v 1.12 1999/09/16 11:45:36 lukem Exp $");
+__RCSID("$NetBSD: strtouq.c,v 1.13 1999/09/20 04:39:42 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -74,12 +74,6 @@ _strtouq(nptr, endptr, base)
_DIAGASSERT(nptr != NULL);
/* endptr may be NULL */
-#ifdef _DIAGNOSTIC
- if (nptr == NULL) {
- errno = EFAULT;
- return ((u_quad_t)0);
- }
-#endif
#ifdef __GNUC__
/* This outrageous construct just to shut up a GCC warning. */
diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c
index 13f29648332..ed8412bb7ec 100644
--- a/lib/libc/stdlib/tdelete.c
+++ b/lib/libc/stdlib/tdelete.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $ */
+/* $NetBSD: tdelete.c,v 1.3 1999/09/20 04:39:43 lukem Exp $ */
/*
* Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -13,7 +13,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
+__RCSID("$NetBSD: tdelete.c,v 1.3 1999/09/20 04:39:43 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -35,10 +35,6 @@ tdelete(vkey, vrootp, compar)
_DIAGASSERT(vkey != NULL);
_DIAGASSERT(compar != NULL);
-#ifdef _DIAGNOSTIC
- if (vkey == NULL || compar == NULL)
- return (NULL);
-#endif
if (rootp == NULL || (p = *rootp) == NULL)
return NULL;
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
index 95c78a64d9e..1924f3113a9 100644
--- a/lib/libc/stdlib/tfind.c
+++ b/lib/libc/stdlib/tfind.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $ */
+/* $NetBSD: tfind.c,v 1.3 1999/09/20 04:39:43 lukem Exp $ */
/*
* Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -13,7 +13,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
+__RCSID("$NetBSD: tfind.c,v 1.3 1999/09/20 04:39:43 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -32,10 +32,6 @@ tfind(vkey, vrootp, compar)
_DIAGASSERT(vkey != NULL);
_DIAGASSERT(compar != NULL);
-#ifdef _DIAGNOSTIC
- if (vkey == NULL || compar == NULL)
- return (NULL);
-#endif
if (rootp == NULL)
return NULL;
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 4ed91b1036e..07883d68a19 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $ */
+/* $NetBSD: tsearch.c,v 1.4 1999/09/20 04:39:43 lukem Exp $ */
/*
* Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -13,7 +13,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
+__RCSID("$NetBSD: tsearch.c,v 1.4 1999/09/20 04:39:43 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -33,10 +33,6 @@ tsearch(vkey, vrootp, compar)
_DIAGASSERT(vkey != NULL);
_DIAGASSERT(compar != NULL);
-#ifdef _DIAGNOSTIC
- if (vkey == NULL || compar == NULL)
- return (NULL);
-#endif
if (rootp == NULL)
return NULL;
diff --git a/lib/libc/string/__strerror.c b/lib/libc/string/__strerror.c
index 8c0f81bb63e..59cee14a006 100644
--- a/lib/libc/string/__strerror.c
+++ b/lib/libc/string/__strerror.c
@@ -1,4 +1,4 @@
-/* $NetBSD: __strerror.c,v 1.15 1999/09/16 11:45:37 lukem Exp $ */
+/* $NetBSD: __strerror.c,v 1.16 1999/09/20 04:39:43 lukem Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -38,7 +38,7 @@
#if 0
static char *sccsid = "@(#)strerror.c 5.6 (Berkeley) 5/4/91";
#else
-__RCSID("$NetBSD: __strerror.c,v 1.15 1999/09/16 11:45:37 lukem Exp $");
+__RCSID("$NetBSD: __strerror.c,v 1.16 1999/09/20 04:39:43 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -74,10 +74,6 @@ __strerror(num, buf, buflen)
catd = catopen("libc", 0);
#endif
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL)
- return (NULL);
-#endif
errnum = num; /* convert to unsigned */
if (errnum < sys_nerr) {
diff --git a/lib/libc/string/__strsignal.c b/lib/libc/string/__strsignal.c
index 099cd3dbb93..bb457168542 100644
--- a/lib/libc/string/__strsignal.c
+++ b/lib/libc/string/__strsignal.c
@@ -1,4 +1,4 @@
-/* $NetBSD: __strsignal.c,v 1.18 1999/09/16 11:45:38 lukem Exp $ */
+/* $NetBSD: __strsignal.c,v 1.19 1999/09/20 04:39:44 lukem Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -38,7 +38,7 @@
#if 0
static char *sccsid = "@(#)strerror.c 5.6 (Berkeley) 5/4/91";
#else
-__RCSID("$NetBSD: __strsignal.c,v 1.18 1999/09/16 11:45:38 lukem Exp $");
+__RCSID("$NetBSD: __strsignal.c,v 1.19 1999/09/20 04:39:44 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,10 +70,6 @@ __strsignal(num, buf, buflen)
#endif
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL)
- return (NULL);
-#endif
signum = num; /* convert to unsigned */
if (signum < sys_nsig) {
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index 0f06a1395c6..fc61d9023cd 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmp.c,v 1.12 1999/09/16 11:45:38 lukem Exp $ */
+/* $NetBSD: bcmp.c,v 1.13 1999/09/20 04:39:44 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)bcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bcmp.c,v 1.12 1999/09/16 11:45:38 lukem Exp $");
+__RCSID("$NetBSD: bcmp.c,v 1.13 1999/09/20 04:39:44 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,6 @@ bcmp(b1, b2, length)
_DIAGASSERT(b1 != 0);
_DIAGASSERT(b2 != 0);
-#ifdef _DIAGNOSTIC
- if (b1 == 0 || b2 == 0)
- return(0);
-#endif
if (length == 0)
return(0);
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index b47369acf98..efa2145394e 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopy.c,v 1.11 1999/09/16 11:45:38 lukem Exp $ */
+/* $NetBSD: bcopy.c,v 1.12 1999/09/20 04:39:44 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)bcopy.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bcopy.c,v 1.11 1999/09/16 11:45:38 lukem Exp $");
+__RCSID("$NetBSD: bcopy.c,v 1.12 1999/09/20 04:39:44 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -89,12 +89,6 @@ bcopy(src0, dst0, length)
_DIAGASSERT(dst0 != 0);
_DIAGASSERT(src0 != 0);
-#ifdef _DIAGNOSTIC
- if (dst0 == 0 || src0 == 0) {
- dst0 = 0;
- goto done;
- }
-#endif
if (length == 0 || dst == src) /* nothing to do */
goto done;
diff --git a/lib/libc/string/bm.c b/lib/libc/string/bm.c
index 916f9492c38..b281cd32f5c 100644
--- a/lib/libc/string/bm.c
+++ b/lib/libc/string/bm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bm.c,v 1.8 1999/09/16 11:45:38 lukem Exp $ */
+/* $NetBSD: bm.c,v 1.9 1999/09/20 04:39:44 lukem Exp $ */
/*-
* Copyright (c) 1994
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)bm.c 8.7 (Berkeley) 6/21/94";
#else
-__RCSID("$NetBSD: bm.c,v 1.8 1999/09/16 11:45:38 lukem Exp $");
+__RCSID("$NetBSD: bm.c,v 1.9 1999/09/20 04:39:44 lukem Exp $");
#endif
#endif /* LIBC_SCCS && not lint */
@@ -117,12 +117,6 @@ bm_comp(pb, len, freq)
_DIAGASSERT(pb != NULL);
/* freq may be NULL */
-#ifdef _DIAGNOSTIC
- if (pb == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
if (len == 0) {
errno = EINVAL;
@@ -175,10 +169,6 @@ bm_free(pat)
{
_DIAGASSERT(pat != NULL);
-#ifdef _DIAGNOSTIC
- if (pat == NULL)
- return;
-#endif
if (pat->pat != NULL)
free(pat->pat);
@@ -199,10 +189,6 @@ bm_exec(pat, base, n)
_DIAGASSERT(pat != NULL);
_DIAGASSERT(base != NULL);
-#ifdef _DIAGNOSTIC
- if (pat == NULL || base == NULL)
- return (NULL);
-#endif
if (n == 0)
return (NULL);
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
index 4aec46fa136..030502ce9bb 100644
--- a/lib/libc/string/index.c
+++ b/lib/libc/string/index.c
@@ -1,4 +1,4 @@
-/* $NetBSD: index.c,v 1.10 1999/09/16 11:45:40 lukem Exp $ */
+/* $NetBSD: index.c,v 1.11 1999/09/20 04:39:44 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)index.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: index.c,v 1.10 1999/09/16 11:45:40 lukem Exp $");
+__RCSID("$NetBSD: index.c,v 1.11 1999/09/20 04:39:44 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,10 +61,6 @@ index(p, ch)
const char *p, ch;
{
_DIAGASSERT(p != NULL);
-#ifdef _DIAGNOSTIC
- if (p == NULL)
- return (NULL);
-#endif
for (;; ++p) {
if (*p == ch)
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
index a62dd419a0b..8c4da6e3063 100644
--- a/lib/libc/string/memccpy.c
+++ b/lib/libc/string/memccpy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memccpy.c,v 1.10 1999/09/16 11:45:40 lukem Exp $ */
+/* $NetBSD: memccpy.c,v 1.11 1999/09/20 04:39:45 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)memccpy.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: memccpy.c,v 1.10 1999/09/16 11:45:40 lukem Exp $");
+__RCSID("$NetBSD: memccpy.c,v 1.11 1999/09/20 04:39:45 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -55,10 +55,6 @@ memccpy(t, f, c, n)
_DIAGASSERT(t != 0);
_DIAGASSERT(f != 0);
-#ifdef _DIAGNOSTIC
- if (t == 0 || f == 0)
- return (0);
-#endif
if (n) {
unsigned char *tp = t;
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index 220a5fe479c..e4df6101279 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memchr.c,v 1.10 1999/09/16 11:45:40 lukem Exp $ */
+/* $NetBSD: memchr.c,v 1.11 1999/09/20 04:39:45 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)memchr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: memchr.c,v 1.10 1999/09/16 11:45:40 lukem Exp $");
+__RCSID("$NetBSD: memchr.c,v 1.11 1999/09/20 04:39:45 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,10 +61,6 @@ memchr(s, c, n)
size_t n;
{
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL)
- return (NULL);
-#endif
if (n != 0) {
const unsigned char *p = s;
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index b9640fe2833..9e70bd17289 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memcmp.c,v 1.10 1999/09/16 11:45:40 lukem Exp $ */
+/* $NetBSD: memcmp.c,v 1.11 1999/09/20 04:39:45 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)memcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: memcmp.c,v 1.10 1999/09/16 11:45:40 lukem Exp $");
+__RCSID("$NetBSD: memcmp.c,v 1.11 1999/09/20 04:39:45 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,6 @@ memcmp(s1, s2, n)
{
_DIAGASSERT(s1 != 0);
_DIAGASSERT(s2 != 0);
-#ifdef _DIAGNOSTIC
- if (s1 == 0 || s2 == 0)
- return (0);
-#endif
if (n != 0) {
const unsigned char *p1 = s1, *p2 = s2;
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index 79c62706def..7beb50f46d4 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memset.c,v 1.13 1999/09/16 11:45:40 lukem Exp $ */
+/* $NetBSD: memset.c,v 1.14 1999/09/20 04:39:45 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)memset.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: memset.c,v 1.13 1999/09/16 11:45:40 lukem Exp $");
+__RCSID("$NetBSD: memset.c,v 1.14 1999/09/20 04:39:45 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -88,10 +88,6 @@ memset(dst0, c0, length)
u_char *dst;
_DIAGASSERT(dst0 != 0);
-#ifdef _DIAGNOSTIC
- if (dst0 == 0)
- RETURN;
-#endif
dst = dst0;
/*
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
index 8faa5348ffc..359d92d02bd 100644
--- a/lib/libc/string/rindex.c
+++ b/lib/libc/string/rindex.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rindex.c,v 1.10 1999/09/16 11:45:40 lukem Exp $ */
+/* $NetBSD: rindex.c,v 1.11 1999/09/20 04:39:45 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)rindex.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: rindex.c,v 1.10 1999/09/16 11:45:40 lukem Exp $");
+__RCSID("$NetBSD: rindex.c,v 1.11 1999/09/20 04:39:45 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,6 @@ rindex(p, ch)
char *save;
_DIAGASSERT(p != NULL);
-#ifdef _DIAGNOSTIC
- if (p == NULL)
- return (NULL);
-#endif
for (save = NULL;; ++p) {
if (*p == ch)
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
index fc903554899..4f9816a5c4e 100644
--- a/lib/libc/string/strcasecmp.c
+++ b/lib/libc/string/strcasecmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcasecmp.c,v 1.10 1999/09/16 11:45:41 lukem Exp $ */
+/* $NetBSD: strcasecmp.c,v 1.11 1999/09/20 04:39:45 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcasecmp.c,v 1.10 1999/09/16 11:45:41 lukem Exp $");
+__RCSID("$NetBSD: strcasecmp.c,v 1.11 1999/09/20 04:39:45 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,6 @@ strcasecmp(s1, s2)
_DIAGASSERT(s1 != NULL);
_DIAGASSERT(s2 != NULL);
-#ifdef _DIAGNOSTIC
- if (s1 == NULL || s2 == NULL)
- return (0);
-#endif
while (tolower(*us1) == tolower(*us2++))
if (*us1++ == '\0')
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index c4191102d26..812e07271a0 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcat.c,v 1.11 1999/09/16 11:45:41 lukem Exp $ */
+/* $NetBSD: strcat.c,v 1.12 1999/09/20 04:39:46 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strcat.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcat.c,v 1.11 1999/09/16 11:45:41 lukem Exp $");
+__RCSID("$NetBSD: strcat.c,v 1.12 1999/09/20 04:39:46 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,10 +60,6 @@ strcat(s, append)
_DIAGASSERT(t != NULL);
_DIAGASSERT(append != NULL);
-#ifdef _DIAGNOSTIC
- if (t == NULL || append == NULL)
- return (NULL);
-#endif
for (; *t; ++t)
;
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index 6b9bdaaa5f1..a1ddae12174 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcmp.c,v 1.11 1999/09/16 11:45:41 lukem Exp $ */
+/* $NetBSD: strcmp.c,v 1.12 1999/09/20 04:39:46 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcmp.c,v 1.11 1999/09/16 11:45:41 lukem Exp $");
+__RCSID("$NetBSD: strcmp.c,v 1.12 1999/09/20 04:39:46 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -64,10 +64,6 @@ strcmp(s1, s2)
_DIAGASSERT(s1 != NULL);
_DIAGASSERT(s2 != NULL);
-#ifdef _DIAGNOSTIC
- if (s1 == NULL || s2 == NULL)
- return (0);
-#endif
while (*s1 == *s2++)
if (*s1++ == 0)
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
index cd7436e382f..0e9dbb16bec 100644
--- a/lib/libc/string/strcoll.c
+++ b/lib/libc/string/strcoll.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcoll.c,v 1.7 1999/09/16 11:45:41 lukem Exp $ */
+/* $NetBSD: strcoll.c,v 1.8 1999/09/20 04:39:46 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)strcoll.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcoll.c,v 1.7 1999/09/16 11:45:41 lukem Exp $");
+__RCSID("$NetBSD: strcoll.c,v 1.8 1999/09/20 04:39:46 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,10 +58,6 @@ strcoll(s1, s2)
_DIAGASSERT(s1 != NULL);
_DIAGASSERT(s2 != NULL);
-#ifdef _DIAGNOSTIC
- if (s1 == NULL || s2 == NULL)
- return (0);
-#endif
/* LC_COLLATE is unimplemented, hence always "C" */
return (strcmp(s1, s2));
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index cd42a18e524..bf011609f16 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcpy.c,v 1.11 1999/09/16 11:45:41 lukem Exp $ */
+/* $NetBSD: strcpy.c,v 1.12 1999/09/20 04:39:46 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strcpy.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcpy.c,v 1.11 1999/09/16 11:45:41 lukem Exp $");
+__RCSID("$NetBSD: strcpy.c,v 1.12 1999/09/20 04:39:46 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,10 +60,6 @@ strcpy(to, from)
_DIAGASSERT(to != NULL);
_DIAGASSERT(from != NULL);
-#ifdef _DIAGNOSTIC
- if (to == NULL || from == NULL)
- return (NULL);
-#endif
for (; (*to = *from) != '\0'; ++from, ++to);
return(save);
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
index 916b05ae9ac..4a172ab35ce 100644
--- a/lib/libc/string/strcspn.c
+++ b/lib/libc/string/strcspn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcspn.c,v 1.8 1999/09/16 11:45:41 lukem Exp $ */
+/* $NetBSD: strcspn.c,v 1.9 1999/09/20 04:39:46 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)strcspn.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcspn.c,v 1.8 1999/09/16 11:45:41 lukem Exp $");
+__RCSID("$NetBSD: strcspn.c,v 1.9 1999/09/20 04:39:46 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,10 +61,6 @@ strcspn(s1, s2)
_DIAGASSERT(s1 != NULL);
_DIAGASSERT(s2 != NULL);
-#ifdef _DIAGNOSTIC
- if (s1 == NULL || s2 == NULL)
- return (0);
-#endif
/*
* Stop as soon as we find any character from s2. Note that there
diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c
index fc8cd9afca4..1de9ad45ac0 100644
--- a/lib/libc/string/strdup.c
+++ b/lib/libc/string/strdup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strdup.c,v 1.10 1999/09/16 11:45:41 lukem Exp $ */
+/* $NetBSD: strdup.c,v 1.11 1999/09/20 04:39:46 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strdup.c,v 1.10 1999/09/16 11:45:41 lukem Exp $");
+__RCSID("$NetBSD: strdup.c,v 1.11 1999/09/20 04:39:46 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,12 +61,6 @@ strdup(str)
char *copy;
_DIAGASSERT(str != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
len = strlen(str) + 1;
if (!(copy = malloc(len)))
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c
index 78f8a0e3a86..29f67b4bb34 100644
--- a/lib/libc/string/strlcat.c
+++ b/lib/libc/string/strlcat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strlcat.c,v 1.4 1999/09/16 11:45:41 lukem Exp $ */
+/* $NetBSD: strlcat.c,v 1.5 1999/09/20 04:39:47 lukem Exp $ */
/* from OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp */
/*
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strlcat.c,v 1.4 1999/09/16 11:45:41 lukem Exp $");
+__RCSID("$NetBSD: strlcat.c,v 1.5 1999/09/20 04:39:47 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -56,10 +56,6 @@ strlcat(dst, src, siz)
_DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL);
-#ifdef _DIAGNOSTIC
- if (dst == NULL || src == NULL)
- return (0);
-#endif
/* Find the end of dst and adjust bytes left but don't go past end */
while (*d != '\0' && n-- != 0)
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
index 58cd488029e..6d19a732439 100644
--- a/lib/libc/string/strlcpy.c
+++ b/lib/libc/string/strlcpy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strlcpy.c,v 1.4 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strlcpy.c,v 1.5 1999/09/20 04:39:47 lukem Exp $ */
/* from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp */
/*
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strlcpy.c,v 1.4 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strlcpy.c,v 1.5 1999/09/20 04:39:47 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -54,10 +54,6 @@ strlcpy(dst, src, siz)
_DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL);
-#ifdef _DIAGNOSTIC
- if (dst == NULL || src == NULL)
- return (0);
-#endif
/* Copy as many bytes as will fit */
if (n != 0 && --n != 0) {
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index 9e2de24b840..aabd2c14c5e 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strlen.c,v 1.10 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strlen.c,v 1.11 1999/09/20 04:39:47 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strlen.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strlen.c,v 1.10 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strlen.c,v 1.11 1999/09/20 04:39:47 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,10 +58,6 @@ strlen(str)
const char *s;
_DIAGASSERT(str != NULL);
-#ifdef _DIAGNOSTIC
- if (str == NULL)
- return (0);
-#endif
for (s = str; *s; ++s);
return(s - str);
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
index 5c442c3e4ce..3ff021f481a 100644
--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strmode.c,v 1.10 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strmode.c,v 1.11 1999/09/20 04:39:47 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strmode.c 8.3 (Berkeley) 8/15/94";
#else
-__RCSID("$NetBSD: strmode.c,v 1.10 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strmode.c,v 1.11 1999/09/20 04:39:47 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -55,10 +55,6 @@ strmode(mode, p)
{
_DIAGASSERT(p != NULL);
-#ifdef _DIAGNOSTIC
- if (p == NULL)
- return;
-#endif
/* print type */
switch (mode & S_IFMT) {
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
index baedf9b98db..d2257485859 100644
--- a/lib/libc/string/strncat.c
+++ b/lib/libc/string/strncat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strncat.c,v 1.8 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strncat.c,v 1.9 1999/09/20 04:39:47 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)strncat.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strncat.c,v 1.8 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strncat.c,v 1.9 1999/09/20 04:39:47 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,10 +61,6 @@ strncat(dst, src, n)
_DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL);
-#ifdef _DIAGNOSTIC
- if (dst == NULL || src == NULL)
- return (NULL);
-#endif
if (n != 0) {
char *d = dst;
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index 38e8bf4a15f..b32297dda12 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strncmp.c,v 1.11 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strncmp.c,v 1.12 1999/09/20 04:39:48 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strncmp.c,v 1.11 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strncmp.c,v 1.12 1999/09/20 04:39:48 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,10 +59,6 @@ strncmp(s1, s2, n)
_DIAGASSERT(s1 != NULL);
_DIAGASSERT(s2 != NULL);
-#ifdef _DIAGNOSTIC
- if (s1 == NULL || s2 == NULL)
- return (0);
-#endif
if (n == 0)
return (0);
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index 0da46ebf42e..68d774bb46a 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strncpy.c,v 1.10 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strncpy.c,v 1.11 1999/09/20 04:39:48 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)strncpy.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strncpy.c,v 1.10 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strncpy.c,v 1.11 1999/09/20 04:39:48 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -67,10 +67,6 @@ strncpy(dst, src, n)
_DIAGASSERT(dst != NULL);
_DIAGASSERT(src != NULL);
-#ifdef _DIAGNOSTIC
- if (dst == NULL || src == NULL)
- return (NULL);
-#endif
if (n != 0) {
char *d = dst;
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
index a90201bea3e..9b0371f607a 100644
--- a/lib/libc/string/strpbrk.c
+++ b/lib/libc/string/strpbrk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strpbrk.c,v 1.9 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strpbrk.c,v 1.10 1999/09/20 04:39:48 lukem Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strpbrk.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strpbrk.c,v 1.9 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strpbrk.c,v 1.10 1999/09/20 04:39:48 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -57,10 +57,6 @@ strpbrk(s1, s2)
_DIAGASSERT(s1 != NULL);
_DIAGASSERT(s2 != NULL);
-#ifdef _DIAGNOSTIC
- if (s1 == NULL || s2 == NULL)
- return (NULL);
-#endif
while ((c = *s1++) != 0) {
for (scanp = s2; (sc = *scanp++) != 0;)
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
index 58aa2e8d51e..51bcca0789a 100644
--- a/lib/libc/string/strsep.c
+++ b/lib/libc/string/strsep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strsep.c,v 1.9 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strsep.c,v 1.10 1999/09/20 04:39:48 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strsep.c,v 1.9 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strsep.c,v 1.10 1999/09/20 04:39:48 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -74,10 +74,6 @@ strsep(stringp, delim)
_DIAGASSERT(stringp != NULL);
_DIAGASSERT(delim != NULL);
-#ifdef _DIAGNOSTIC
- if (stringp == NULL || delim == NULL)
- return (NULL);
-#endif
if ((s = *stringp) == NULL)
return (NULL);
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
index 5958d140927..6b952b8de1f 100644
--- a/lib/libc/string/strspn.c
+++ b/lib/libc/string/strspn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strspn.c,v 1.8 1999/09/16 11:45:42 lukem Exp $ */
+/* $NetBSD: strspn.c,v 1.9 1999/09/20 04:39:48 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strspn.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strspn.c,v 1.8 1999/09/16 11:45:42 lukem Exp $");
+__RCSID("$NetBSD: strspn.c,v 1.9 1999/09/20 04:39:48 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,10 +58,6 @@ strspn(s1, s2)
_DIAGASSERT(s1 != NULL);
_DIAGASSERT(s2 != NULL);
-#ifdef _DIAGNOSTIC
- if (s1 == NULL || s2 == NULL)
- return (0);
-#endif
/*
* Skip any characters in s2, excluding the terminating \0.
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
index 24fab22985e..060decd17ae 100644
--- a/lib/libc/string/strstr.c
+++ b/lib/libc/string/strstr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strstr.c,v 1.9 1999/09/16 11:45:43 lukem Exp $ */
+/* $NetBSD: strstr.c,v 1.10 1999/09/20 04:39:48 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strstr.c,v 1.9 1999/09/16 11:45:43 lukem Exp $");
+__RCSID("$NetBSD: strstr.c,v 1.10 1999/09/20 04:39:48 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,10 +60,6 @@ strstr(s, find)
_DIAGASSERT(s != NULL);
_DIAGASSERT(find != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL || find == NULL)
- return (NULL);
-#endif
if ((c = *find++) != 0) {
len = strlen(find);
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
index d95c271996a..fc41f0f8213 100644
--- a/lib/libc/string/strtok.c
+++ b/lib/libc/string/strtok.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strtok.c,v 1.9 1999/09/16 11:45:43 lukem Exp $ */
+/* $NetBSD: strtok.c,v 1.10 1999/09/20 04:39:49 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)strtok.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strtok.c,v 1.9 1999/09/16 11:45:43 lukem Exp $");
+__RCSID("$NetBSD: strtok.c,v 1.10 1999/09/20 04:39:49 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -57,10 +57,6 @@ strtok(s, delim)
/* s may be NULL */
_DIAGASSERT(delim != NULL);
-#ifdef _DIAGNOSTIC
- if (delim == NULL)
- return (NULL);
-#endif
if (s == NULL && (s = last) == NULL)
return (NULL);
diff --git a/lib/libc/string/strtok_r.c b/lib/libc/string/strtok_r.c
index 77a345ae699..19953dace5a 100644
--- a/lib/libc/string/strtok_r.c
+++ b/lib/libc/string/strtok_r.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strtok_r.c,v 1.6 1999/09/16 11:45:43 lukem Exp $ */
+/* $NetBSD: strtok_r.c,v 1.7 1999/09/20 04:39:49 lukem Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -38,7 +38,7 @@
#if 0
static char *sccsid = "@(#)strtok.c 5.8 (Berkeley) 2/24/91";
#else
-__RCSID("$NetBSD: strtok_r.c,v 1.6 1999/09/16 11:45:43 lukem Exp $");
+__RCSID("$NetBSD: strtok_r.c,v 1.7 1999/09/20 04:39:49 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -64,10 +64,6 @@ strtok_r(s, delim, lasts)
/* s may be NULL */
_DIAGASSERT(delim != NULL);
_DIAGASSERT(lasts != NULL);
-#ifdef _DIAGNOSTIC
- if (delim == NULL || lasts == NULL)
- return (NULL);
-#endif
if (s == NULL && (s = *lasts) == NULL)
return (NULL);
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index ca5e2ac856a..d18ecd545d1 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strxfrm.c,v 1.8 1999/09/16 11:45:43 lukem Exp $ */
+/* $NetBSD: strxfrm.c,v 1.9 1999/09/20 04:39:49 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)strxfrm.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strxfrm.c,v 1.8 1999/09/16 11:45:43 lukem Exp $");
+__RCSID("$NetBSD: strxfrm.c,v 1.9 1999/09/20 04:39:49 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,10 +63,6 @@ strxfrm(dst, src, n)
_DIAGASSERT(src != NULL);
_DIAGASSERT(dst != NULL);
-#ifdef _DIAGNOSTIC
- if (src == NULL || dst == NULL)
- return (0);
-#endif
/*
* Since locales are unimplemented, this is just a copy.
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
index e2c08a39587..bb20f735c37 100644
--- a/lib/libc/string/swab.c
+++ b/lib/libc/string/swab.c
@@ -1,4 +1,4 @@
-/* $NetBSD: swab.c,v 1.8 1999/09/16 11:45:43 lukem Exp $ */
+/* $NetBSD: swab.c,v 1.9 1999/09/20 04:39:49 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: swab.c,v 1.8 1999/09/16 11:45:43 lukem Exp $");
+__RCSID("$NetBSD: swab.c,v 1.9 1999/09/20 04:39:49 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -60,10 +60,6 @@ swab(from, to, len)
_DIAGASSERT(from != NULL);
_DIAGASSERT(to != NULL);
-#ifdef _DIAGNOSTIC
- if (from == NULL || to == NULL)
- return;
-#endif
n = (len >> 1) + 1;
fp = (char *)from;
diff --git a/lib/libc/termios/cfgetispeed.c b/lib/libc/termios/cfgetispeed.c
index 6f35b506130..6619f4afebf 100644
--- a/lib/libc/termios/cfgetispeed.c
+++ b/lib/libc/termios/cfgetispeed.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfgetispeed.c,v 1.4 1999/09/16 11:45:43 lukem Exp $ */
+/* $NetBSD: cfgetispeed.c,v 1.5 1999/09/20 04:39:50 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: cfgetispeed.c,v 1.4 1999/09/16 11:45:43 lukem Exp $");
+__RCSID("$NetBSD: cfgetispeed.c,v 1.5 1999/09/20 04:39:50 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,10 +58,6 @@ cfgetispeed(t)
{
_DIAGASSERT(t != NULL);
-#ifdef _DIAGNOSTIC
- if (t == NULL)
- return (0);
-#endif
return (t->c_ispeed);
}
diff --git a/lib/libc/termios/cfgetospeed.c b/lib/libc/termios/cfgetospeed.c
index b77b6b07e6b..1bfa65eacea 100644
--- a/lib/libc/termios/cfgetospeed.c
+++ b/lib/libc/termios/cfgetospeed.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfgetospeed.c,v 1.4 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: cfgetospeed.c,v 1.5 1999/09/20 04:39:50 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: cfgetospeed.c,v 1.4 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: cfgetospeed.c,v 1.5 1999/09/20 04:39:50 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,10 +58,6 @@ cfgetospeed(t)
{
_DIAGASSERT(t != NULL);
-#ifdef _DIAGNOSTIC
- if (t == NULL)
- return (0);
-#endif
return (t->c_ospeed);
}
diff --git a/lib/libc/termios/cfmakeraw.c b/lib/libc/termios/cfmakeraw.c
index 37d57363f4a..d95f752fdac 100644
--- a/lib/libc/termios/cfmakeraw.c
+++ b/lib/libc/termios/cfmakeraw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfmakeraw.c,v 1.6 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: cfmakeraw.c,v 1.7 1999/09/20 04:39:50 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: cfmakeraw.c,v 1.6 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: cfmakeraw.c,v 1.7 1999/09/20 04:39:50 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,10 +62,6 @@ cfmakeraw(t)
{
_DIAGASSERT(t != NULL);
-#ifdef _DIAGNOSTIC
- if (t == NULL)
- return;
-#endif
t->c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
t->c_oflag &= ~OPOST;
diff --git a/lib/libc/termios/cfsetispeed.c b/lib/libc/termios/cfsetispeed.c
index 4879eba98e3..099084d47fa 100644
--- a/lib/libc/termios/cfsetispeed.c
+++ b/lib/libc/termios/cfsetispeed.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfsetispeed.c,v 1.4 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: cfsetispeed.c,v 1.5 1999/09/20 04:39:50 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: cfsetispeed.c,v 1.4 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: cfsetispeed.c,v 1.5 1999/09/20 04:39:50 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,10 +59,6 @@ cfsetispeed(t, speed)
{
_DIAGASSERT(t != NULL);
-#ifdef _DIAGNOSTIC
- if (t == NULL)
- return (-1);
-#endif
t->c_ispeed = speed;
return (0);
diff --git a/lib/libc/termios/cfsetospeed.c b/lib/libc/termios/cfsetospeed.c
index 379b63cb838..5a954735848 100644
--- a/lib/libc/termios/cfsetospeed.c
+++ b/lib/libc/termios/cfsetospeed.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfsetospeed.c,v 1.4 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: cfsetospeed.c,v 1.5 1999/09/20 04:39:50 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: cfsetospeed.c,v 1.4 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: cfsetospeed.c,v 1.5 1999/09/20 04:39:50 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,10 +59,6 @@ cfsetospeed(t, speed)
{
_DIAGASSERT(t != NULL);
-#ifdef _DIAGNOSTIC
- if (t == NULL)
- return (-1);
-#endif
t->c_ospeed = speed;
return (0);
diff --git a/lib/libc/termios/cfsetspeed.c b/lib/libc/termios/cfsetspeed.c
index b661a4d23f4..3d6333f311a 100644
--- a/lib/libc/termios/cfsetspeed.c
+++ b/lib/libc/termios/cfsetspeed.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfsetspeed.c,v 1.4 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: cfsetspeed.c,v 1.5 1999/09/20 04:39:51 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: cfsetspeed.c,v 1.4 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: cfsetspeed.c,v 1.5 1999/09/20 04:39:51 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,10 +59,6 @@ cfsetspeed(t, speed)
{
_DIAGASSERT(t != NULL);
-#ifdef _DIAGNOSTIC
- if (t == NULL)
- return (-1);
-#endif
t->c_ispeed = t->c_ospeed = speed;
return (0);
diff --git a/lib/libc/termios/tcdrain.c b/lib/libc/termios/tcdrain.c
index 92b14fc12ca..ef218bf04b2 100644
--- a/lib/libc/termios/tcdrain.c
+++ b/lib/libc/termios/tcdrain.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcdrain.c,v 1.5 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: tcdrain.c,v 1.6 1999/09/20 04:39:51 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcdrain.c,v 1.5 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: tcdrain.c,v 1.6 1999/09/20 04:39:51 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -59,12 +59,6 @@ tcdrain(fd)
{
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
return (ioctl(fd, TIOCDRAIN, 0));
}
diff --git a/lib/libc/termios/tcflow.c b/lib/libc/termios/tcflow.c
index 993f3d204cb..1359ac0697c 100644
--- a/lib/libc/termios/tcflow.c
+++ b/lib/libc/termios/tcflow.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcflow.c,v 1.5 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: tcflow.c,v 1.6 1999/09/20 04:39:51 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcflow.c,v 1.5 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: tcflow.c,v 1.6 1999/09/20 04:39:51 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ tcflow(fd, action)
u_char c;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
switch (action) {
case TCOOFF:
diff --git a/lib/libc/termios/tcflush.c b/lib/libc/termios/tcflush.c
index 8b0568f2dee..4da3a37c34c 100644
--- a/lib/libc/termios/tcflush.c
+++ b/lib/libc/termios/tcflush.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcflush.c,v 1.6 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: tcflush.c,v 1.7 1999/09/20 04:39:51 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcflush.c,v 1.6 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: tcflush.c,v 1.7 1999/09/20 04:39:51 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,12 +61,6 @@ tcflush(fd, which)
int com;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
switch (which) {
case TCIFLUSH:
diff --git a/lib/libc/termios/tcgetattr.c b/lib/libc/termios/tcgetattr.c
index 0887304ae15..f7a1340e92d 100644
--- a/lib/libc/termios/tcgetattr.c
+++ b/lib/libc/termios/tcgetattr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcgetattr.c,v 1.5 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: tcgetattr.c,v 1.6 1999/09/20 04:39:51 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcgetattr.c,v 1.5 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: tcgetattr.c,v 1.6 1999/09/20 04:39:51 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,16 +62,6 @@ tcgetattr(fd, t)
_DIAGASSERT(fd != -1);
_DIAGASSERT(t != NULL);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
- if (t == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
return (ioctl(fd, TIOCGETA, t));
}
diff --git a/lib/libc/termios/tcgetpgrp.c b/lib/libc/termios/tcgetpgrp.c
index 0124d290c6a..09d92701432 100644
--- a/lib/libc/termios/tcgetpgrp.c
+++ b/lib/libc/termios/tcgetpgrp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcgetpgrp.c,v 1.5 1999/09/16 11:45:44 lukem Exp $ */
+/* $NetBSD: tcgetpgrp.c,v 1.6 1999/09/20 04:39:52 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcgetpgrp.c,v 1.5 1999/09/16 11:45:44 lukem Exp $");
+__RCSID("$NetBSD: tcgetpgrp.c,v 1.6 1999/09/20 04:39:52 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ tcgetpgrp(fd)
int s;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
if (ioctl(fd, TIOCGPGRP, &s) < 0)
return ((pid_t)-1);
diff --git a/lib/libc/termios/tcgetsid.c b/lib/libc/termios/tcgetsid.c
index 942c8b7a098..82d54c58f5c 100644
--- a/lib/libc/termios/tcgetsid.c
+++ b/lib/libc/termios/tcgetsid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcgetsid.c,v 1.3 1999/09/16 11:45:45 lukem Exp $ */
+/* $NetBSD: tcgetsid.c,v 1.4 1999/09/20 04:39:52 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcgetsid.c,v 1.3 1999/09/16 11:45:45 lukem Exp $");
+__RCSID("$NetBSD: tcgetsid.c,v 1.4 1999/09/20 04:39:52 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -62,12 +62,6 @@ tcgetsid(fd)
int s;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
if (ioctl(fd, TIOCGSID, &s) < 0)
return ((pid_t)-1);
diff --git a/lib/libc/termios/tcsendbreak.c b/lib/libc/termios/tcsendbreak.c
index 47030e5a18e..5c7b7582bc7 100644
--- a/lib/libc/termios/tcsendbreak.c
+++ b/lib/libc/termios/tcsendbreak.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcsendbreak.c,v 1.6 1999/09/16 11:45:45 lukem Exp $ */
+/* $NetBSD: tcsendbreak.c,v 1.7 1999/09/20 04:39:52 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcsendbreak.c,v 1.6 1999/09/16 11:45:45 lukem Exp $");
+__RCSID("$NetBSD: tcsendbreak.c,v 1.7 1999/09/20 04:39:52 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -64,12 +64,6 @@ tcsendbreak(fd, len)
static const struct timespec sleepytime = { 0, 400000000 };
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
if (ioctl(fd, TIOCSBRK, 0) == -1)
return (-1);
diff --git a/lib/libc/termios/tcsetattr.c b/lib/libc/termios/tcsetattr.c
index de21d91c18d..8c140c8f6c0 100644
--- a/lib/libc/termios/tcsetattr.c
+++ b/lib/libc/termios/tcsetattr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcsetattr.c,v 1.5 1999/09/16 11:45:45 lukem Exp $ */
+/* $NetBSD: tcsetattr.c,v 1.6 1999/09/20 04:39:53 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcsetattr.c,v 1.5 1999/09/16 11:45:45 lukem Exp $");
+__RCSID("$NetBSD: tcsetattr.c,v 1.6 1999/09/20 04:39:53 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -63,16 +63,6 @@ tcsetattr(fd, opt, t)
_DIAGASSERT(fd != -1);
_DIAGASSERT(t != NULL);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
- if (t == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (opt & TCSASOFT) {
localterm = *t;
diff --git a/lib/libc/termios/tcsetpgrp.c b/lib/libc/termios/tcsetpgrp.c
index 5e219e33195..13963155a24 100644
--- a/lib/libc/termios/tcsetpgrp.c
+++ b/lib/libc/termios/tcsetpgrp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcsetpgrp.c,v 1.5 1999/09/16 11:45:45 lukem Exp $ */
+/* $NetBSD: tcsetpgrp.c,v 1.6 1999/09/20 04:39:53 lukem Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#else
-__RCSID("$NetBSD: tcsetpgrp.c,v 1.5 1999/09/16 11:45:45 lukem Exp $");
+__RCSID("$NetBSD: tcsetpgrp.c,v 1.6 1999/09/20 04:39:53 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -67,12 +67,6 @@ tcsetpgrp(fd, pgrp)
int s;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
s = pgrp;
return (ioctl(fd, TIOCSPGRP, &s));
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index d4ea563b2b2..b217d0552b1 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xdryp.c,v 1.23 1999/09/16 11:45:45 lukem Exp $ */
+/* $NetBSD: xdryp.c,v 1.24 1999/09/20 04:39:55 lukem Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe <thorpej@NetBSD.ORG>.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: xdryp.c,v 1.23 1999/09/16 11:45:45 lukem Exp $");
+__RCSID("$NetBSD: xdryp.c,v 1.24 1999/09/20 04:39:55 lukem Exp $");
#endif
/*
@@ -108,10 +108,6 @@ xdr_domainname(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_string(xdrs, &objp, YPMAXDOMAIN);
}
@@ -127,10 +123,6 @@ xdr_peername(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_string(xdrs, &objp, YPMAXPEER);
}
@@ -146,10 +138,6 @@ xdr_mapname(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_string(xdrs, &objp, YPMAXMAP);
}
@@ -162,10 +150,6 @@ xdr_ypdomain_wrap_string(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_string(xdrs, objp, YPMAXDOMAIN);
}
@@ -178,10 +162,6 @@ xdr_ypmap_wrap_string(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_string(xdrs, objp, YPMAXMAP);
}
@@ -194,10 +174,6 @@ xdr_ypowner_wrap_string(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_string(xdrs, objp, YPMAXPEER);
}
@@ -210,10 +186,6 @@ xdr_datum(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_bytes(xdrs, (char **)&objp->dptr,
(u_int *)&objp->dsize, YPMAXRECORD);
@@ -227,10 +199,6 @@ xdr_ypreq_key(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypdomain_wrap_string(xdrs, (char **)&objp->domain))
return FALSE;
@@ -252,10 +220,6 @@ xdr_ypreq_nokey(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypdomain_wrap_string(xdrs, (char **)&objp->domain))
return FALSE;
@@ -274,10 +238,6 @@ xdr_yp_inaddr(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_opaque(xdrs, (caddr_t)(void *)&objp->s_addr,
sizeof objp->s_addr);
@@ -291,10 +251,6 @@ xdr_ypbind_binding(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_yp_inaddr(xdrs, &objp->ypbind_binding_addr))
return FALSE;
@@ -314,10 +270,6 @@ xdr_ypbind_resptype(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_enum(xdrs, (enum_t *)objp);
}
@@ -330,10 +282,6 @@ xdr_ypstat(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_enum(xdrs, (enum_t *)objp);
}
@@ -346,10 +294,6 @@ xdr_ypbind_resp(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypbind_resptype(xdrs, &objp->ypbind_status))
return FALSE;
@@ -377,10 +321,6 @@ xdr_ypresp_val(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)&objp->status))
return FALSE;
@@ -400,10 +340,6 @@ xdr_ypbind_setdom(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
cp = objp->ypsetdom_domain;
@@ -427,10 +363,6 @@ xdr_ypresp_key_val(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)&objp->status))
return FALSE;
@@ -455,10 +387,6 @@ xdr_ypall(xdrs, incallback)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(incallback != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || incallback == NULL)
- return FALSE;
-#endif
/*
* Set up key/val struct to be used during the transaction.
@@ -505,10 +433,6 @@ xdr_ypresp_master(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)&objp->status))
return FALSE;
@@ -527,10 +451,6 @@ xdr_ypmaplist_str(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
return xdr_string(xdrs, &objp, YPMAXMAP+1);
}
@@ -543,10 +463,6 @@ xdr_ypmaplist(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypmaplist_str(xdrs, objp->ypml_name))
return FALSE;
@@ -566,10 +482,6 @@ xdr_ypresp_maplist(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)&objp->status))
return FALSE;
@@ -589,10 +501,6 @@ xdr_ypresp_order(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypstat(xdrs, (enum ypbind_resptype *)&objp->status))
return FALSE;
@@ -611,10 +519,6 @@ xdr_ypreq_xfr(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypmap_parms(xdrs, &objp->map_parms))
return FALSE;
@@ -639,10 +543,6 @@ xdr_ypmap_parms(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_ypdomain_wrap_string(xdrs, (char **)&objp->domain))
return FALSE;
@@ -667,10 +567,6 @@ xdr_yppushresp_xfr(xdrs, objp)
_DIAGASSERT(xdrs != NULL);
_DIAGASSERT(objp != NULL);
-#ifdef _DIAGNOSTIC
- if (xdrs == NULL || objp == NULL)
- return FALSE;
-#endif
if (!xdr_u_int(xdrs, &objp->transid))
return FALSE;
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index 0a8fc70bac8..d998c1b568f 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yplib.c,v 1.34 1999/09/16 11:45:46 lukem Exp $ */
+/* $NetBSD: yplib.c,v 1.35 1999/09/20 04:39:55 lukem Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yplib.c,v 1.34 1999/09/16 11:45:46 lukem Exp $");
+__RCSID("$NetBSD: yplib.c,v 1.35 1999/09/20 04:39:55 lukem Exp $");
#endif
#include "namespace.h"
@@ -262,10 +262,6 @@ __yp_unbind(ypb)
{
_DIAGASSERT(ypb != NULL);
-#ifdef _DIAGNOSTIC
- if (ypb == NULL)
- return;
-#endif
clnt_destroy(ypb->dom_client);
ypb->dom_client = NULL;
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libcompat/4.1/ftime.c
index ac065db8d12..d88c3f076f9 100644
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libcompat/4.1/ftime.c
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ftime.c,v 1.7 1999/09/16 11:45:46 lukem Exp $");
+__RCSID("$NetBSD: ftime.c,v 1.8 1999/09/20 04:48:01 lukem Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -48,12 +48,6 @@ ftime(tbp)
struct timeval t;
_DIAGASSERT(tbp != 0);
-#ifdef _DIAGNOSTIC
- if (tbp == 0) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (gettimeofday(&t, &tz) < 0)
return (-1);
diff --git a/lib/libcompat/4.1/gtty.c b/lib/libcompat/4.1/gtty.c
index 5c10be12a93..c15ed85b471 100644
--- a/lib/libcompat/4.1/gtty.c
+++ b/lib/libcompat/4.1/gtty.c
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: gtty.c,v 1.3 1999/09/16 11:45:46 lukem Exp $");
+__RCSID("$NetBSD: gtty.c,v 1.4 1999/09/20 04:48:01 lukem Exp $");
#endif /* not lint */
#include <assert.h>
@@ -50,16 +50,6 @@ gtty(fd, tty)
_DIAGASSERT(fd != -1);
_DIAGASSERT(tty != 0);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
- if (tty == 0) {
- errno = EINVAL;
- return (-1);
- }
-#endif
return (ioctl(fd, TIOCGETP, tty));
}
diff --git a/lib/libcompat/4.1/stty.c b/lib/libcompat/4.1/stty.c
index e6537e798b5..0dc8e2e30da 100644
--- a/lib/libcompat/4.1/stty.c
+++ b/lib/libcompat/4.1/stty.c
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: stty.c,v 1.3 1999/09/16 11:45:46 lukem Exp $");
+__RCSID("$NetBSD: stty.c,v 1.4 1999/09/20 04:48:01 lukem Exp $");
#endif /* not lint */
#include <assert.h>
@@ -50,16 +50,6 @@ stty(fd, tty)
_DIAGASSERT(fd != -1);
_DIAGASSERT(tty != 0);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
- if (tty == 0) {
- errno = EINVAL;
- return (-1);
- }
-#endif
return (ioctl(fd, TIOCSETP, tty));
}
diff --git a/lib/libcompat/4.3/insque.c b/lib/libcompat/4.3/insque.c
index b53819151f1..26cb7dcb7df 100644
--- a/lib/libcompat/4.3/insque.c
+++ b/lib/libcompat/4.3/insque.c
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: insque.c,v 1.7 1999/09/16 11:45:47 lukem Exp $");
+__RCSID("$NetBSD: insque.c,v 1.8 1999/09/20 04:48:03 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -49,10 +49,6 @@ insque(entry, pred)
_DIAGASSERT(e != 0);
_DIAGASSERT(p != 0);
-#ifdef _DIAGNOSTIC
- if (e == 0 || p == 0)
- return;
-#endif
e->q_forw = p->q_forw;
e->q_back = p;
diff --git a/lib/libcompat/4.3/lsearch.c b/lib/libcompat/4.3/lsearch.c
index 8f3b3a9a0f4..0ee9121a60f 100644
--- a/lib/libcompat/4.3/lsearch.c
+++ b/lib/libcompat/4.3/lsearch.c
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: lsearch.c,v 1.6 1999/09/16 11:45:47 lukem Exp $");
+__RCSID("$NetBSD: lsearch.c,v 1.7 1999/09/20 04:48:03 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -64,12 +64,6 @@ lsearch(key, base, nelp, width, compar)
_DIAGASSERT(key != NULL);
_DIAGASSERT(base != NULL);
_DIAGASSERT(compar != NULL);
-#ifdef _DIAGNOSTIC
- if (key == NULL || base == NULL || compar == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
return(linear_base(key, base, nelp, width, compar, 1));
}
@@ -84,12 +78,6 @@ lfind(key, base, nelp, width, compar)
_DIAGASSERT(key != NULL);
_DIAGASSERT(base != NULL);
_DIAGASSERT(compar != NULL);
-#ifdef _DIAGNOSTIC
- if (key == NULL || base == NULL || compar == NULL) {
- errno = EFAULT;
- return (NULL);
- }
-#endif
return(linear_base(key, base, nelp, width, compar, 0));
}
diff --git a/lib/libcompat/4.3/regex.c b/lib/libcompat/4.3/regex.c
index 8b807339d8d..a7cdb8a7241 100644
--- a/lib/libcompat/4.3/regex.c
+++ b/lib/libcompat/4.3/regex.c
@@ -46,7 +46,7 @@
#if 0
static char sccsid[] = "from: @(#)regex.c 5.1 (Berkeley) 3/29/92";*/
#else
-__RCSID("$NetBSD: regex.c,v 1.10 1999/09/16 11:45:47 lukem Exp $");
+__RCSID("$NetBSD: regex.c,v 1.11 1999/09/20 04:48:03 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -87,10 +87,6 @@ re_exec(s)
{
int rc;
-#ifdef _DIAGNOSTIC
- if (s == NULL || *s == '\0')
- return (-1);
-#endif
re_goterr = 0;
rc = regexec(re_regexp, s);
@@ -103,10 +99,6 @@ regerror(s)
{
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL)
- s = "ERROR: regerror() called with NULL pointer";
-#endif
re_goterr = 1;
if (re_errstr)
diff --git a/lib/libcompat/4.3/remque.c b/lib/libcompat/4.3/remque.c
index 9178149b368..31cac5d3669 100644
--- a/lib/libcompat/4.3/remque.c
+++ b/lib/libcompat/4.3/remque.c
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: remque.c,v 1.7 1999/09/16 11:45:47 lukem Exp $");
+__RCSID("$NetBSD: remque.c,v 1.8 1999/09/20 04:48:04 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
@@ -46,10 +46,6 @@ remque(element)
struct qelem *e = (struct qelem *) element;
_DIAGASSERT(e != 0);
-#ifdef _DIAGNOSTIC
- if (e == 0)
- return;
-#endif
e->q_forw->q_back = e->q_back;
e->q_back->q_forw = e->q_forw;
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index 7631493d17e..f3e9897bab4 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rexec.c,v 1.12 1999/09/16 11:45:47 lukem Exp $ */
+/* $NetBSD: rexec.c,v 1.13 1999/09/20 04:48:04 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: rexec.c,v 1.12 1999/09/16 11:45:47 lukem Exp $");
+__RCSID("$NetBSD: rexec.c,v 1.13 1999/09/20 04:48:04 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,10 +81,6 @@ rexec(ahost, rport, name, pass, cmd, fd2p)
_DIAGASSERT(pass != NULL);
_DIAGASSERT(cmd != NULL);
/* fd2p may be NULL */
-#ifdef _DIAGNOSTIC
- if (ahost == NULL || name == NULL || pass == NULL || cmd == NULL)
- return (-1);
-#endif
hp = gethostbyname(*ahost);
if (hp == 0) {
diff --git a/lib/libcompat/4.3/ruserpass.c b/lib/libcompat/4.3/ruserpass.c
index 937fad7a347..b410b3d7971 100644
--- a/lib/libcompat/4.3/ruserpass.c
+++ b/lib/libcompat/4.3/ruserpass.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ruserpass.c,v 1.6 1999/09/16 11:45:47 lukem Exp $ */
+/* $NetBSD: ruserpass.c,v 1.7 1999/09/20 04:48:04 lukem Exp $ */
/*
* Copyright (c) 1985, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95";
#else
-__RCSID("$NetBSD: ruserpass.c,v 1.6 1999/09/16 11:45:47 lukem Exp $");
+__RCSID("$NetBSD: ruserpass.c,v 1.7 1999/09/20 04:48:04 lukem Exp $");
#endif
#endif /* not lint */
@@ -106,10 +106,6 @@ ruserpass(host, aname, apass)
_DIAGASSERT(host != NULL);
_DIAGASSERT(aname != NULL);
_DIAGASSERT(apass != NULL);
-#ifdef _DIAGNOSTIC
- if (host == NULL || aname == NULL || apass == NULL)
- return (-1);
-#endif
hdir = getenv("HOME");
if (hdir == NULL)
diff --git a/lib/libcompat/regexp/regerror.c b/lib/libcompat/regexp/regerror.c
index 2f0ce766d4b..756c54f5697 100644
--- a/lib/libcompat/regexp/regerror.c
+++ b/lib/libcompat/regexp/regerror.c
@@ -1,6 +1,6 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: regerror.c,v 1.7 1999/09/16 11:45:48 lukem Exp $");
+__RCSID("$NetBSD: regerror.c,v 1.8 1999/09/20 04:48:04 lukem Exp $");
#endif /* not lint */
#include <assert.h>
@@ -14,10 +14,6 @@ const char *s;
{
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL)
- s = "ERROR: __compat_regerror() called with s == NULL";
-#endif
#ifdef ERRAVAIL
error("regexp: %s", s);
diff --git a/lib/librmt/rmtlib.c b/lib/librmt/rmtlib.c
index 8e822c48025..d7af8313a0a 100644
--- a/lib/librmt/rmtlib.c
+++ b/lib/librmt/rmtlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rmtlib.c,v 1.12 1999/09/16 11:45:49 lukem Exp $ */
+/* $NetBSD: rmtlib.c,v 1.13 1999/09/20 04:48:05 lukem Exp $ */
/*
* rmt --- remote tape emulator subroutines
@@ -705,12 +705,6 @@ rmtopen(va_alist)
va_end(ap);
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (-1);
- }
-#endif
if (remdev (path))
{
@@ -736,12 +730,6 @@ rmtaccess(path, amode)
{
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (-1);
- }
-#endif
if (remdev (path))
{
@@ -778,12 +766,6 @@ rmtread(fildes, buf, nbyte)
{
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (isrmt (fildes))
{
@@ -808,12 +790,6 @@ rmtwrite(fildes, buf, nbyte)
{
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (isrmt (fildes))
{
@@ -941,12 +917,6 @@ rmtfstat(fildes, buf)
{
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (buf == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (isrmt (fildes))
{
@@ -972,16 +942,6 @@ rmtstat(path, buf)
_DIAGASSERT(path != NULL);
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (-1);
- }
- if (buf == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (remdev (path))
{
@@ -1007,12 +967,6 @@ rmtcreat(path, mode)
{
_DIAGASSERT(path != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (-1);
- }
-#endif
if (remdev (path))
{
@@ -1091,16 +1045,6 @@ rmtlstat(path, buf)
_DIAGASSERT(path != NULL);
_DIAGASSERT(buf != NULL);
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (-1);
- }
- if (buf == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (remdev (path))
{
diff --git a/lib/libterm/termcap.c b/lib/libterm/termcap.c
index de59eef2193..104ae63f71e 100644
--- a/lib/libterm/termcap.c
+++ b/lib/libterm/termcap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: termcap.c,v 1.21 1999/09/16 11:45:49 lukem Exp $ */
+/* $NetBSD: termcap.c,v 1.22 1999/09/20 04:48:05 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)termcap.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: termcap.c,v 1.21 1999/09/16 11:45:49 lukem Exp $");
+__RCSID("$NetBSD: termcap.c,v 1.22 1999/09/20 04:48:05 lukem Exp $");
#endif
#endif /* not lint */
@@ -101,10 +101,6 @@ t_getent(bp, name)
_DIAGASSERT(bp != NULL);
_DIAGASSERT(name != NULL);
-#ifdef _DIAGNOSTIC
- if (bp == NULL || name == NULL)
- return (-2);
-#endif
if ((*bp = malloc(sizeof(struct tinfo))) == NULL) return 0;
@@ -233,10 +229,6 @@ t_getnum(info, id)
long num;
_DIAGASSERT(id != NULL);
-#ifdef _DIAGNOSTIC
- if (id == NULL)
- return (-1);
-#endif
if (cgetnum(info->info, id, &num) == 0)
return (int)(num);
@@ -270,10 +262,6 @@ tgetflag(id)
{
_DIAGASSERT(id != NULL);
-#ifdef _DIAGNOSTIC
- if (id == NULL)
- return (-1);
-#endif
return t_getflag(fbuf, id);
}
@@ -300,10 +288,6 @@ t_getstr(info, id, area, limit)
_DIAGASSERT(id != NULL);
_DIAGASSERT(area != NULL);
-#ifdef _DIAGNOSTIC
- if (id == NULL || area == NULL)
- return (NULL);
-#endif
/*
* XXX
diff --git a/lib/libterm/tputs.c b/lib/libterm/tputs.c
index 397ccf26940..e9f842274f6 100644
--- a/lib/libterm/tputs.c
+++ b/lib/libterm/tputs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tputs.c,v 1.12 1999/09/16 11:45:49 lukem Exp $ */
+/* $NetBSD: tputs.c,v 1.13 1999/09/20 04:48:06 lukem Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tputs.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tputs.c,v 1.12 1999/09/16 11:45:49 lukem Exp $");
+__RCSID("$NetBSD: tputs.c,v 1.13 1999/09/20 04:48:06 lukem Exp $");
#endif
#endif /* not lint */
@@ -116,10 +116,6 @@ tputs(cp, affcnt, outc)
int mspc10;
_DIAGASSERT(outc != 0);
-#ifdef _DIAGNOSTIC
- if (outc == 0)
- return;
-#endif
if (cp == 0)
return;
diff --git a/lib/libusb/data.c b/lib/libusb/data.c
index aa29f6382e6..127482b9b75 100644
--- a/lib/libusb/data.c
+++ b/lib/libusb/data.c
@@ -1,4 +1,4 @@
-/* $NetBSD: data.c,v 1.5 1999/09/16 11:45:50 lukem Exp $ */
+/* $NetBSD: data.c,v 1.6 1999/09/20 04:48:12 lukem Exp $ */
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
@@ -41,10 +41,6 @@ hid_get_data(void *p, hid_item_t *h)
_DIAGASSERT(p != NULL);
_DIAGASSERT(h != NULL);
-#ifdef _DIAGNOSTIC
- if (p == NULL || h == NULL)
- return (0);
-#endif
buf = p;
hpos = h->pos; /* bit position of data */
@@ -77,10 +73,6 @@ hid_set_data(void *p, hid_item_t *h, int data)
_DIAGASSERT(p != NULL);
_DIAGASSERT(h != NULL);
-#ifdef _DIAGNOSTIC
- if (p == NULL || h == NULL)
- return;
-#endif
buf = p;
hpos = h->pos; /* bit position of data */
diff --git a/lib/libusb/descr.c b/lib/libusb/descr.c
index e636c446008..db1bb5f1657 100644
--- a/lib/libusb/descr.c
+++ b/lib/libusb/descr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: descr.c,v 1.5 1999/09/16 11:45:50 lukem Exp $ */
+/* $NetBSD: descr.c,v 1.6 1999/09/20 04:48:12 lukem Exp $ */
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
@@ -47,12 +47,6 @@ hid_get_report_desc(fd)
report_desc_t r;
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (0);
- }
-#endif
rep.size = 0;
if (ioctl(fd, USB_GET_REPORT_DESC, &rep) < 0)
diff --git a/lib/libusb/parse.c b/lib/libusb/parse.c
index ed9d89473bb..dae75b1c5f8 100644
--- a/lib/libusb/parse.c
+++ b/lib/libusb/parse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.5 1999/09/16 11:45:50 lukem Exp $ */
+/* $NetBSD: parse.c,v 1.6 1999/09/20 04:48:12 lukem Exp $ */
/*
* Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org>
@@ -76,10 +76,6 @@ hid_start_parse(report_desc_t d, int kindset)
struct hid_data *s;
_DIAGASSERT(d != NULL);
-#ifdef _DIAGNOSTIC
- if (d == NULL)
- return (0);
-#endif
s = malloc(sizeof *s);
memset(s, 0, sizeof *s);
@@ -94,10 +90,6 @@ hid_end_parse(hid_data_t s)
{
_DIAGASSERT(s != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL)
- return;
-#endif
while (s->cur.next) {
hid_item_t *hi = s->cur.next->next;
@@ -120,10 +112,6 @@ hid_get_item(hid_data_t s, hid_item_t *h)
_DIAGASSERT(s != NULL);
_DIAGASSERT(h != NULL);
-#ifdef _DIAGNOSTIC
- if (s == NULL || h == NULL)
- return (-1);
-#endif
c = &s->cur;
@@ -369,10 +357,6 @@ hid_report_size(report_desc_t r, enum hid_kind k, int *idp)
_DIAGASSERT(r != NULL);
/* idp may be NULL */
-#ifdef _DIAGNOSTIC
- if (r == NULL)
- return (0);
-#endif
id = 0;
if (idp)
@@ -401,10 +385,6 @@ hid_locate(desc, u, k, h)
_DIAGASSERT(desc != NULL);
_DIAGASSERT(h != NULL);
-#ifdef _DIAGNOSTIC
- if (desc == NULL || h == NULL)
- return (0);
-#endif
for (d = hid_start_parse(desc, 1<<k); hid_get_item(d, h); ) {
if (h->kind == k && !(h->flags & HIO_CONST) && h->usage == u) {
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index e8fe584f584..cd4d3ddf3d1 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fparseln.c,v 1.8 1999/09/16 11:45:50 lukem Exp $ */
+/* $NetBSD: fparseln.c,v 1.9 1999/09/20 04:48:06 lukem Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fparseln.c,v 1.8 1999/09/16 11:45:50 lukem Exp $");
+__RCSID("$NetBSD: fparseln.c,v 1.9 1999/09/20 04:48:06 lukem Exp $");
#endif
#include <assert.h>
@@ -57,10 +57,6 @@ isescaped(sp, p, esc)
_DIAGASSERT(sp != NULL);
_DIAGASSERT(p != NULL);
-#ifdef _DIAGNOSTIC
- if (sp == NULL || p == NULL)
- return 0;
-#endif
/* No escape character */
if (esc == '\0')
@@ -97,12 +93,6 @@ fparseln(fp, size, lineno, str, flags)
char esc, con, nl, com;
_DIAGASSERT(fp != NULL);
-#ifdef _DIAGNOSTIC
- if (fp == NULL) {
- errno = EBADF;
- return NULL;
- }
-#endif
len = 0;
buf = NULL;
diff --git a/lib/libutil/login.c b/lib/libutil/login.c
index 62808e5f68f..47ca76025bd 100644
--- a/lib/libutil/login.c
+++ b/lib/libutil/login.c
@@ -1,4 +1,4 @@
-/* $NetBSD: login.c,v 1.11 1999/09/16 11:45:50 lukem Exp $ */
+/* $NetBSD: login.c,v 1.12 1999/09/20 04:48:06 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)login.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: login.c,v 1.11 1999/09/16 11:45:50 lukem Exp $");
+__RCSID("$NetBSD: login.c,v 1.12 1999/09/20 04:48:06 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -61,10 +61,6 @@ login(ut)
int tty;
_DIAGASSERT(ut != NULL);
-#ifdef _DIAGNOSTIC
- if (ut == NULL)
- return;
-#endif
tty = ttyslot();
if (tty > 0 && (fd = open(_PATH_UTMP, O_WRONLY|O_CREAT, 0644)) >= 0) {
diff --git a/lib/libutil/login_tty.c b/lib/libutil/login_tty.c
index be0d66a5829..d30e0785173 100644
--- a/lib/libutil/login_tty.c
+++ b/lib/libutil/login_tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: login_tty.c,v 1.8 1999/09/16 11:45:50 lukem Exp $ */
+/* $NetBSD: login_tty.c,v 1.9 1999/09/20 04:48:07 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)login_tty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: login_tty.c,v 1.8 1999/09/16 11:45:50 lukem Exp $");
+__RCSID("$NetBSD: login_tty.c,v 1.9 1999/09/20 04:48:07 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -56,12 +56,6 @@ login_tty(fd)
{
_DIAGASSERT(fd != -1);
-#ifdef _DIAGNOSTIC
- if (fd == -1) {
- errno = EBADF;
- return (-1);
- }
-#endif
(void) setsid();
if (ioctl(fd, TIOCSCTTY, (char *)NULL) == -1)
diff --git a/lib/libutil/logout.c b/lib/libutil/logout.c
index f0bf520e108..198564789b0 100644
--- a/lib/libutil/logout.c
+++ b/lib/libutil/logout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: logout.c,v 1.10 1999/09/16 11:45:50 lukem Exp $ */
+/* $NetBSD: logout.c,v 1.11 1999/09/20 04:48:07 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)logout.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: logout.c,v 1.10 1999/09/16 11:45:50 lukem Exp $");
+__RCSID("$NetBSD: logout.c,v 1.11 1999/09/20 04:48:07 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -64,10 +64,6 @@ logout(line)
UTMP ut;
_DIAGASSERT(line != NULL);
-#ifdef _DIAGNOSTIC
- if (line == NULL)
- return(0);
-#endif
if ((fd = open(_PATH_UTMP, O_RDWR, 0)) < 0)
return(0);
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
index 2049087de4f..f1e68ba1170 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/libutil/logwtmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: logwtmp.c,v 1.9 1999/09/16 11:45:51 lukem Exp $ */
+/* $NetBSD: logwtmp.c,v 1.10 1999/09/20 04:48:07 lukem Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: logwtmp.c,v 1.9 1999/09/16 11:45:51 lukem Exp $");
+__RCSID("$NetBSD: logwtmp.c,v 1.10 1999/09/20 04:48:07 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -65,10 +65,6 @@ logwtmp(line, name, host)
_DIAGASSERT(line != NULL);
_DIAGASSERT(name != NULL);
_DIAGASSERT(host != NULL);
-#ifdef _DIAGNOSTIC
- if (line == NULL || name == NULL || host == NULL)
- return;
-#endif
if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) < 0)
return;
diff --git a/lib/libutil/opendisk.c b/lib/libutil/opendisk.c
index 52b2c0cbf52..b72247d07f7 100644
--- a/lib/libutil/opendisk.c
+++ b/lib/libutil/opendisk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opendisk.c,v 1.5 1999/09/16 11:45:51 lukem Exp $ */
+/* $NetBSD: opendisk.c,v 1.6 1999/09/20 04:48:07 lukem Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: opendisk.c,v 1.5 1999/09/16 11:45:51 lukem Exp $");
+__RCSID("$NetBSD: opendisk.c,v 1.6 1999/09/20 04:48:07 lukem Exp $");
#endif
#include <sys/param.h>
@@ -61,12 +61,6 @@ opendisk(path, flags, buf, buflen, iscooked)
{
int f, rawpart;
-#ifdef _DIAGNOSTIC
- if (path == NULL || *path == '\0') {
- errno = ENOENT;
- return (-1);
- }
-#endif
if (buf == NULL) {
errno = EFAULT;
diff --git a/lib/libutil/passwd.c b/lib/libutil/passwd.c
index 659e57ea63d..3d92e996eb7 100644
--- a/lib/libutil/passwd.c
+++ b/lib/libutil/passwd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: passwd.c,v 1.17 1999/09/17 01:28:12 lukem Exp $ */
+/* $NetBSD: passwd.c,v 1.18 1999/09/20 04:48:11 lukem Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: passwd.c,v 1.17 1999/09/17 01:28:12 lukem Exp $");
+__RCSID("$NetBSD: passwd.c,v 1.18 1999/09/20 04:48:11 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -282,10 +282,6 @@ pw_copy(ffd, tfd, pw, old_pw)
_DIAGASSERT(pw != NULL);
/* old_pw may be NULL */
-#ifdef _DIAGNOSTIC
- if (pw == NULL)
- return;
-#endif
if (!(from = fdopen(ffd, "r")))
pw_error(_PATH_MASTERPASSWD, 1, 1);
diff --git a/lib/libutil/pidlock.c b/lib/libutil/pidlock.c
index 85b644d6165..394b9635c55 100644
--- a/lib/libutil/pidlock.c
+++ b/lib/libutil/pidlock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pidlock.c,v 1.7 1999/09/16 11:45:51 lukem Exp $ */
+/* $NetBSD: pidlock.c,v 1.8 1999/09/20 04:48:08 lukem Exp $ */
/*
* Copyright 1996, 1997 by Curt Sampson <cjs@netbsd.org>.
@@ -24,7 +24,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pidlock.c,v 1.7 1999/09/16 11:45:51 lukem Exp $");
+__RCSID("$NetBSD: pidlock.c,v 1.8 1999/09/20 04:48:08 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -63,12 +63,6 @@ pidlock(lockfile, flags, locker, info)
_DIAGASSERT(lockfile != NULL);
/* locker may be NULL */
/* info may be NULL */
-#ifdef _DIAGNOSTIC
- if (lockfile == NULL) {
- errno = EFAULT;
- return -1;
- }
-#endif
if (gethostname(hostname, sizeof(hostname)))
@@ -212,12 +206,6 @@ ttylock(tty, flags, locker)
_DIAGASSERT(tty != NULL);
/* locker is not used */
-#ifdef _DIAGNOSTIC
- if (tty == NULL || *tty == '\0') {
- errno = ENOENT;
- return -1;
- }
-#endif
/* make sure the tty exists */
strcpy(ttyfile, DEVPATH);
@@ -244,12 +232,6 @@ ttyunlock(tty)
struct stat sb;
_DIAGASSERT(tty != NULL);
-#ifdef _DIAGNOSTIC
- if (tty == NULL || *tty == '\0') {
- errno = ENOENT;
- return -1;
- }
-#endif
/* make sure the tty exists */
strcpy(ttyfile, DEVPATH);
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 3b82296f55b..8d83e6946d9 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pty.c,v 1.13 1999/09/16 11:45:51 lukem Exp $ */
+/* $NetBSD: pty.c,v 1.14 1999/09/20 04:48:08 lukem Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)pty.c 8.3 (Berkeley) 5/16/94";
#else
-__RCSID("$NetBSD: pty.c,v 1.13 1999/09/16 11:45:51 lukem Exp $");
+__RCSID("$NetBSD: pty.c,v 1.14 1999/09/20 04:48:08 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,12 +81,6 @@ openpty(amaster, aslave, name, termp, winp)
/* name may be NULL */
/* termp may be NULL */
/* winp may be NULL */
-#ifdef _DIAGNOSTIC
- if (amaster == NULL || aslave == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if ((gr = getgrnam("tty")) != NULL)
ttygid = gr->gr_gid;
@@ -141,12 +135,6 @@ forkpty(amaster, name, termp, winp)
/* name may be NULL */
/* termp may be NULL */
/* winp may be NULL */
-#ifdef _DIAGNOSTIC
- if (amaster == NULL) {
- errno = EFAULT;
- return (-1);
- }
-#endif
if (openpty(&master, &slave, name, termp, winp) == -1)
return (-1);
diff --git a/lib/libutil/ttyaction.c b/lib/libutil/ttyaction.c
index 466e815db0f..cd1ff6c1128 100644
--- a/lib/libutil/ttyaction.c
+++ b/lib/libutil/ttyaction.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttyaction.c,v 1.12 1999/09/16 11:45:51 lukem Exp $ */
+/* $NetBSD: ttyaction.c,v 1.13 1999/09/20 04:48:10 lukem Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -84,10 +84,6 @@ ttyaction(tty, act, user)
_DIAGASSERT(tty != NULL);
_DIAGASSERT(act != NULL);
_DIAGASSERT(user != NULL);
-#ifdef _DIAGNOSTIC
- if (tty == NULL || act == NULL || user == NULL)
- return 0;
-#endif
fp = fopen(actfile, "r");
if (fp == NULL)
diff --git a/lib/libutil/ttymsg.c b/lib/libutil/ttymsg.c
index 3cf87a51167..cc50fb51ac6 100644
--- a/lib/libutil/ttymsg.c
+++ b/lib/libutil/ttymsg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ttymsg.c,v 1.13 1999/09/16 11:45:51 lukem Exp $ */
+/* $NetBSD: ttymsg.c,v 1.14 1999/09/20 04:48:11 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93";
#else
-__RCSID("$NetBSD: ttymsg.c,v 1.13 1999/09/16 11:45:51 lukem Exp $");
+__RCSID("$NetBSD: ttymsg.c,v 1.14 1999/09/20 04:48:11 lukem Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -81,14 +81,6 @@ ttymsg(iov, iovcnt, line, tmout)
_DIAGASSERT(iov != NULL);
_DIAGASSERT(iovcnt >= 0);
_DIAGASSERT(line != NULL);
-#ifdef _DIAGNOSTIC
- if (iov == NULL)
- return ("ttymsg(3) called with iov == NULL");
- if (iovcnt < 0)
- return ("ttymsg(3) called with iovcnt < 0");
- if (line == NULL)
- return ("ttymsg(3) called with line == NULL");
-#endif
if (iovcnt > sizeof(localiov) / sizeof(localiov[0]))
return ("too many iov's (change code in libutil/ttymsg.c)");
diff --git a/lib/liby/yyerror.c b/lib/liby/yyerror.c
index 0a3b58c724e..c86a89471f4 100644
--- a/lib/liby/yyerror.c
+++ b/lib/liby/yyerror.c
@@ -36,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)yyerror.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: yyerror.c,v 1.6 1999/09/16 11:45:52 lukem Exp $");
+__RCSID("$NetBSD: yyerror.c,v 1.7 1999/09/20 04:48:11 lukem Exp $");
#endif
#endif /* not lint */
@@ -51,10 +51,6 @@ yyerror(msg)
{
_DIAGASSERT(msg != NULL);
-#ifdef _DIAGNOSTIC
- if (msg == NULL)
- msg = "ERROR: yyerror() called with msg == NULL";
-#endif
(void)fprintf(stderr, "%s\n", msg);
return(0);