Module Name: src
Committed By: matt
Date: Tue Oct 22 08:08:51 UTC 2013
Modified Files:
src/lib/libc/stdlib: jrand48.c lrand48.c mrand48.c nrand48.c
Log Message:
Reduce amount of casts and make LP64 safe.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/stdlib/jrand48.c \
src/lib/libc/stdlib/lrand48.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdlib/mrand48.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/stdlib/nrand48.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/jrand48.c
diff -u src/lib/libc/stdlib/jrand48.c:1.8 src/lib/libc/stdlib/jrand48.c:1.9
--- src/lib/libc/stdlib/jrand48.c:1.8 Sun Jun 12 05:21:28 2005
+++ src/lib/libc/stdlib/jrand48.c Tue Oct 22 08:08:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: jrand48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $ */
+/* $NetBSD: jrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: jrand48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $");
+__RCSID("$NetBSD: jrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -35,5 +35,5 @@ jrand48(unsigned short xseed[3])
_DIAGASSERT(xseed != NULL);
__dorand48(xseed);
- return ((long) xseed[2] << 16) + (long) xseed[1];
+ return (int16_t)xseed[2] * 65536 + xseed[1];
}
Index: src/lib/libc/stdlib/lrand48.c
diff -u src/lib/libc/stdlib/lrand48.c:1.8 src/lib/libc/stdlib/lrand48.c:1.9
--- src/lib/libc/stdlib/lrand48.c:1.8 Sun Jun 12 05:21:28 2005
+++ src/lib/libc/stdlib/lrand48.c Tue Oct 22 08:08:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lrand48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $ */
+/* $NetBSD: lrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: lrand48.c,v 1.8 2005/06/12 05:21:28 lukem Exp $");
+__RCSID("$NetBSD: lrand48.c,v 1.9 2013/10/22 08:08:51 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -29,6 +29,5 @@ long
lrand48(void)
{
__dorand48(__rand48_seed);
- return (long)((unsigned long) __rand48_seed[2] << 15) +
- ((unsigned long) __rand48_seed[1] >> 1);
+ return __rand48_seed[2] * 32768 + (__rand48_seed[1] >> 1);
}
Index: src/lib/libc/stdlib/mrand48.c
diff -u src/lib/libc/stdlib/mrand48.c:1.7 src/lib/libc/stdlib/mrand48.c:1.8
--- src/lib/libc/stdlib/mrand48.c:1.7 Sun Jun 12 05:21:28 2005
+++ src/lib/libc/stdlib/mrand48.c Tue Oct 22 08:08:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mrand48.c,v 1.7 2005/06/12 05:21:28 lukem Exp $ */
+/* $NetBSD: mrand48.c,v 1.8 2013/10/22 08:08:51 matt Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: mrand48.c,v 1.7 2005/06/12 05:21:28 lukem Exp $");
+__RCSID("$NetBSD: mrand48.c,v 1.8 2013/10/22 08:08:51 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -29,5 +29,5 @@ long
mrand48(void)
{
__dorand48(__rand48_seed);
- return ((long) __rand48_seed[2] << 16) + (long) __rand48_seed[1];
+ return (int16_t)__rand48_seed[2] * 65536 + __rand48_seed[1];
}
Index: src/lib/libc/stdlib/nrand48.c
diff -u src/lib/libc/stdlib/nrand48.c:1.9 src/lib/libc/stdlib/nrand48.c:1.10
--- src/lib/libc/stdlib/nrand48.c:1.9 Sun Jun 12 05:21:28 2005
+++ src/lib/libc/stdlib/nrand48.c Tue Oct 22 08:08:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nrand48.c,v 1.9 2005/06/12 05:21:28 lukem Exp $ */
+/* $NetBSD: nrand48.c,v 1.10 2013/10/22 08:08:51 matt Exp $ */
/*
* Copyright (c) 1993 Martin Birgmeier
@@ -15,7 +15,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: nrand48.c,v 1.9 2005/06/12 05:21:28 lukem Exp $");
+__RCSID("$NetBSD: nrand48.c,v 1.10 2013/10/22 08:08:51 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -34,6 +34,5 @@ nrand48(unsigned short xseed[3])
_DIAGASSERT(xseed != NULL);
__dorand48(xseed);
- return (long)((unsigned long) xseed[2] << 15) +
- ((unsigned long) xseed[1] >> 1);
+ return xseed[2] * 32768 + (xseed[1] >> 1);
}
