[src/trunk]: src/lib/libc/stdlib Reduce amount of casts and make LP64 safe.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e0fdb9f1110a
branches:  trunk
changeset: 790811:e0fdb9f1110a
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Oct 22 08:08:51 2013 +0000

description:
Reduce amount of casts and make LP64 safe.

diffstat:

 lib/libc/stdlib/jrand48.c |  6 +++---
 lib/libc/stdlib/lrand48.c |  7 +++----
 lib/libc/stdlib/mrand48.c |  6 +++---
 lib/libc/stdlib/nrand48.c |  7 +++----
 4 files changed, 12 insertions(+), 14 deletions(-)

diffs (102 lines):

diff -r 64f78810b0c3 -r e0fdb9f1110a lib/libc/stdlib/jrand48.c
--- a/lib/libc/stdlib/jrand48.c Tue Oct 22 07:30:20 2013 +0000
+++ b/lib/libc/stdlib/jrand48.c Tue Oct 22 08:08:51 2013 +0000
@@ -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 @@
        _DIAGASSERT(xseed != NULL);
 
        __dorand48(xseed);
-       return ((long) xseed[2] << 16) + (long) xseed[1];
+       return (int16_t)xseed[2] * 65536 + xseed[1];
 }
diff -r 64f78810b0c3 -r e0fdb9f1110a lib/libc/stdlib/lrand48.c
--- a/lib/libc/stdlib/lrand48.c Tue Oct 22 07:30:20 2013 +0000
+++ b/lib/libc/stdlib/lrand48.c Tue Oct 22 08:08:51 2013 +0000
@@ -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 @@
 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);
 }
diff -r 64f78810b0c3 -r e0fdb9f1110a lib/libc/stdlib/mrand48.c
--- a/lib/libc/stdlib/mrand48.c Tue Oct 22 07:30:20 2013 +0000
+++ b/lib/libc/stdlib/mrand48.c Tue Oct 22 08:08:51 2013 +0000
@@ -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 @@
 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];
 }
diff -r 64f78810b0c3 -r e0fdb9f1110a lib/libc/stdlib/nrand48.c
--- a/lib/libc/stdlib/nrand48.c Tue Oct 22 07:30:20 2013 +0000
+++ b/lib/libc/stdlib/nrand48.c Tue Oct 22 08:08:51 2013 +0000
@@ -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 @@
        _DIAGASSERT(xseed != NULL);
 
        __dorand48(xseed);
-       return (long)((unsigned long) xseed[2] << 15) +
-           ((unsigned long) xseed[1] >> 1);
+       return xseed[2] * 32768 + (xseed[1] >> 1);
 }