Skip to content

Commit

Permalink
magic: Remove K&R style of arguments
Browse files Browse the repository at this point in the history
The __P() macro does not exist in libmusl so
I switched magic.{c,h} to using the std-c argument style, which had
already been used in some functions.

Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
  • Loading branch information
kurt-vd authored and paulusmack committed Oct 1, 2019
1 parent 347904e commit f6330ec
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
15 changes: 7 additions & 8 deletions pppd/magic.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@

static const char rcsid[] = RCSID;

extern long mrand48 __P((void));
extern void srand48 __P((long));
extern long mrand48 (void);
extern void srand48 (long);

/*
* magic_init - Initialize the magic number generator.
Expand All @@ -64,7 +64,7 @@ extern void srand48 __P((long));
* and current time, currently.
*/
void
magic_init()
magic_init(void)
{
long seed;
struct timeval t;
Expand All @@ -78,7 +78,7 @@ magic_init()
* magic - Returns the next magic number.
*/
u_int32_t
magic()
magic(void)
{
return (u_int32_t) mrand48();
}
Expand All @@ -102,20 +102,19 @@ random_bytes(unsigned char *buf, int len)
*/

double
drand48()
drand48(void)
{
return (double)random() / (double)0x7fffffffL; /* 2**31-1 */
}

long
mrand48()
mrand48(void)
{
return random();
}

void
srand48(seedval)
long seedval;
srand48(long seedval)
{
srandom((int)seedval);
}
Expand Down
6 changes: 3 additions & 3 deletions pppd/magic.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
* $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
*/

void magic_init __P((void)); /* Initialize the magic number generator */
u_int32_t magic __P((void)); /* Returns the next magic number */
void magic_init (void); /* Initialize the magic number generator */
u_int32_t magic (void); /* Returns the next magic number */

/* Fill buffer with random bytes */
void random_bytes __P((unsigned char *buf, int len));
void random_bytes (unsigned char *buf, int len);

0 comments on commit f6330ec

Please sign in to comment.