diff options
Diffstat (limited to 'lib/libc/stdlib')
33 files changed, 57 insertions, 237 deletions
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; |
