diff options
Diffstat (limited to 'lib/libc/stdlib')
| -rw-r--r-- | lib/libc/stdlib/Makefile.inc | 2 | ||||
| -rw-r--r-- | lib/libc/stdlib/multibyte.c | 105 | ||||
| -rw-r--r-- | lib/libc/stdlib/rand.c | 2 |
3 files changed, 2 insertions, 107 deletions
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 0bd1a90ab56aa..c5736ba7172fc 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -4,7 +4,7 @@ .PATH: ${.CURDIR}/${MACHINE}/stdlib ${.CURDIR}/stdlib SRCS+= abort.c atexit.c atoi.c atol.c bsearch.c calloc.c exit.c \ - getenv.c getopt.c heapsort.c malloc.c multibyte.c \ + getenv.c getopt.c heapsort.c malloc.c \ putenv.c qsort.c radixsort.c rand.c random.c setenv.c strtod.c \ strtol.c strtoul.c system.c \ _rand48.c drand48.c erand48.c jrand48.c lcong48.c lrand48.c \ diff --git a/lib/libc/stdlib/multibyte.c b/lib/libc/stdlib/multibyte.c deleted file mode 100644 index 6951279696336..0000000000000 --- a/lib/libc/stdlib/multibyte.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)multibyte.c 5.1 (Berkeley) 2/18/91"; -#endif /* LIBC_SCCS and not lint */ - -#include <stdlib.h> - -/* - * Stub multibyte character functions. - * These ignore the current fixed ("C") locale and - * always indicate that no multibyte characters are supported. - */ - -int -mblen(s, n) - const char *s; - size_t n; -{ - if (s && n && *s) - return -1; - return 0; -} - -/*ARGSUSED*/ -int -mbtowc(pwc, s, n) - wchar_t *pwc; - const char *s; - size_t n; -{ - if (s && n && *s) - return -1; - return 0; -} - -/*ARGSUSED*/ -int -#ifdef __STDC__ -wctomb(char *s, wchar_t wchar) -#else -wctomb(s, wchar) - char *s; - wchar_t wchar; -#endif -{ - if (s) - return -1; - return 0; -} - -/*ARGSUSED*/ -size_t -mbstowcs(pwcs, s, n) - wchar_t *pwcs; - const char *s; - size_t n; -{ - if (s && n && *s) - return -1; - return 0; -} - -/*ARGSUSED*/ -size_t -wcstombs(s, pwcs, n) - char *s; - const wchar_t *pwcs; - size_t n; -{ - if (pwcs && n && *pwcs) - return -1; - return 0; -} diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c index f96af30056057..3879281d2581b 100644 --- a/lib/libc/stdlib/rand.c +++ b/lib/libc/stdlib/rand.c @@ -43,7 +43,7 @@ static u_long next = 1; int rand() { - return ((next = next * 1103515245 + 12345) % (RAND_MAX + 1)); + return ((next = next * 1103515245 + 12345) % ((u_long)RAND_MAX + 1)); } void |