archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove rand_r implementation

Browse source 
We already use our own mt13397 implementation nowadays, so we no
longer need this shim.
This commit is contained in:
Nikita Popov 2020-03-26 11:49:27 +01:00
parent 97cb81ead5
commit e8e09b60b4
3 changed files with 0 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -582,7 +582,6 @@ nl_langinfo \
poll \ poll \
ptsname \ ptsname \
putenv \ putenv \
rand_r \
scandir \ scandir \
setitimer \ setitimer \
setenv \ setenv \

6
main/php_reentrancy.h
View file

@ -99,12 +99,6 @@ char *strtok_r(char *s, const char *delim, char **last);
#endif #endif
#endif #endif
#if !defined(HAVE_RAND_R)
PHPAPI int php_rand_r(unsigned int *seed);
#else
#define php_rand_r rand_r
#endif
END_EXTERN_C() END_EXTERN_C()
#if !defined(ZTS) #if !defined(ZTS)

57
main/reentrancy.c
View file

@ -207,63 +207,6 @@ void reentrancy_shutdown(void)
#endif #endif
#ifndef HAVE_RAND_R
/*-
* Copyright (c) 1990, 1993
* 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.
*
* Posix rand_r function added May 1999 by Wes Peters <wes@softweyr.com>.
*/
#include <sys/types.h>
#include <stdlib.h>
static int
do_rand(unsigned long *ctx)
{
return ((*ctx = *ctx * 1103515245 + 12345) % ((u_long)PHP_RAND_MAX + 1));
}
PHPAPI int
php_rand_r(unsigned int *ctx)
{
u_long val = (u_long) *ctx;
*ctx = do_rand(&val);
return (int) *ctx;
}
#endif
#ifndef HAVE_STRTOK_R #ifndef HAVE_STRTOK_R