From 31a1060a5a75d4f2aa3c3a5a7b948eb512d53387 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 1 Oct 2012 14:14:21 -0700 Subject: Upgrade seed48 too. Missed this in 774c7f54ff375d71106283d42779b0cc5f238f87. Change-Id: Ic24fd67f003d0e2d192cfb08f96f63024ca817eb --- libc/Android.mk | 2 +- libc/stdlib/seed48.c | 37 ----------------------- libc/upstream-netbsd/libc/stdlib/seed48.c | 49 +++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 38 deletions(-) delete mode 100644 libc/stdlib/seed48.c create mode 100644 libc/upstream-netbsd/libc/stdlib/seed48.c (limited to 'libc') diff --git a/libc/Android.mk b/libc/Android.mk index 2fc430065..f1bfd715c 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -155,7 +155,6 @@ libc_common_src_files := \ stdlib/locale.c \ stdlib/putenv.c \ stdlib/qsort.c \ - stdlib/seed48.c \ stdlib/setenv.c \ stdlib/setjmperr.c \ stdlib/strntoimax.c \ @@ -341,6 +340,7 @@ libc_upstream_netbsd_src_files := \ upstream-netbsd/libc/stdlib/mrand48.c \ upstream-netbsd/libc/stdlib/nrand48.c \ upstream-netbsd/libc/stdlib/_rand48.c \ + upstream-netbsd/libc/stdlib/seed48.c \ upstream-netbsd/libc/stdlib/srand48.c \ upstream-netbsd/libc/stdlib/tdelete.c \ upstream-netbsd/libc/stdlib/tfind.c \ diff --git a/libc/stdlib/seed48.c b/libc/stdlib/seed48.c deleted file mode 100644 index 583262f2d..000000000 --- a/libc/stdlib/seed48.c +++ /dev/null @@ -1,37 +0,0 @@ -/* $OpenBSD: seed48.c,v 1.3 2005/08/08 08:05:37 espie Exp $ */ -/* - * Copyright (c) 1993 Martin Birgmeier - * All rights reserved. - * - * You may redistribute unmodified or modified versions of this source - * code provided that the above copyright notice and this and the - * following conditions are retained. - * - * This software is provided ``as is'', and comes with no warranties - * of any kind. I shall in no event be liable for anything that happens - * to anyone/anything when using this software. - */ - -#include "rand48.h" - -extern unsigned short __rand48_seed[3]; -extern unsigned short __rand48_mult[3]; -extern unsigned short __rand48_add; - -unsigned short * -seed48(unsigned short xseed[3]) -{ - static unsigned short sseed[3]; - - sseed[0] = __rand48_seed[0]; - sseed[1] = __rand48_seed[1]; - sseed[2] = __rand48_seed[2]; - __rand48_seed[0] = xseed[0]; - __rand48_seed[1] = xseed[1]; - __rand48_seed[2] = xseed[2]; - __rand48_mult[0] = RAND48_MULT_0; - __rand48_mult[1] = RAND48_MULT_1; - __rand48_mult[2] = RAND48_MULT_2; - __rand48_add = RAND48_ADD; - return sseed; -} diff --git a/libc/upstream-netbsd/libc/stdlib/seed48.c b/libc/upstream-netbsd/libc/stdlib/seed48.c new file mode 100644 index 000000000..36c05701c --- /dev/null +++ b/libc/upstream-netbsd/libc/stdlib/seed48.c @@ -0,0 +1,49 @@ +/* $NetBSD: seed48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $ */ + +/* + * Copyright (c) 1993 Martin Birgmeier + * All rights reserved. + * + * You may redistribute unmodified or modified versions of this source + * code provided that the above copyright notice and this and the + * following conditions are retained. + * + * This software is provided ``as is'', and comes with no warranties + * of any kind. I shall in no event be liable for anything that happens + * to anyone/anything when using this software. + */ + +#include +#if defined(LIBC_SCCS) && !defined(lint) +__RCSID("$NetBSD: seed48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $"); +#endif /* LIBC_SCCS and not lint */ + +#include "namespace.h" + +#include + +#include "rand48.h" + +#ifdef __weak_alias +__weak_alias(seed48,_seed48) +#endif + +unsigned short * +seed48(unsigned short xseed[3]) +{ + static unsigned short sseed[3]; + + _DIAGASSERT(xseed != NULL); + + sseed[0] = __rand48_seed[0]; + sseed[1] = __rand48_seed[1]; + sseed[2] = __rand48_seed[2]; + __rand48_seed[0] = xseed[0]; + __rand48_seed[1] = xseed[1]; + __rand48_seed[2] = xseed[2]; + __rand48_mult[0] = RAND48_MULT_0; + __rand48_mult[1] = RAND48_MULT_1; + __rand48_mult[2] = RAND48_MULT_2; + __rand48_add = RAND48_ADD; + return sseed; +} -- cgit v1.2.3