diff options
| author | lukem <lukem@NetBSD.org> | 1999-09-20 04:38:56 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 1999-09-20 04:38:56 +0000 |
| commit | d896261208b4610b0c4e86ea95caad3cdc86a4ac (patch) | |
| tree | 9a96db945c9ffba191e3aa4d741cf5d30fbd30f2 /lib/libc/stdio | |
| parent | f6ae64deff8e64a1acb3e1536bf6b6d06f7bffb9 (diff) | |
back out the #ifdef _DIAGNOSTIC argument checks; too many people complained.
_DIAGASSERT() is still retained.
Diffstat (limited to 'lib/libc/stdio')
62 files changed, 124 insertions, 582 deletions
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) |
