use uint32 instead of u_long

This commit is contained in:
Paul Mackerras 1994-09-01 00:25:35 +00:00
parent 57f5bd8403
commit 9398ab236f
2 changed files with 10 additions and 10 deletions

View File

@ -18,19 +18,19 @@
*/ */
#ifndef lint #ifndef lint
static char rcsid[] = "$Id: magic.c,v 1.1 1993/11/11 03:54:25 paulus Exp $"; static char rcsid[] = "$Id: magic.c,v 1.2 1994/09/01 00:25:19 paulus Exp $";
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#include "pppd.h"
#include "magic.h" #include "magic.h"
static uint32 next; /* Next value to return */
static u_long next; /* Next value to return */ extern uint32 gethostid __ARGS((void));
extern u_long gethostid __ARGS((void));
extern long random __ARGS((void)); extern long random __ARGS((void));
extern void srandom __ARGS((int)); extern void srandom __ARGS((int));
@ -51,7 +51,7 @@ void magic_init()
perror("gettimeofday"); perror("gettimeofday");
exit(1); exit(1);
} }
next ^= (u_long) tv.tv_sec ^ (u_long) tv.tv_usec; next ^= (uint32) tv.tv_sec ^ (uint32) tv.tv_usec;
srandom((int) next); srandom((int) next);
} }
@ -60,11 +60,11 @@ void magic_init()
/* /*
* magic - Returns the next magic number. * magic - Returns the next magic number.
*/ */
u_long magic() uint32 magic()
{ {
u_long m; uint32 m;
m = next; m = next;
next = (u_long) random(); next = (uint32) random();
return (m); return (m);
} }

View File

@ -16,9 +16,9 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
* *
* $Id: magic.h,v 1.1 1993/11/11 03:54:25 paulus Exp $ * $Id: magic.h,v 1.2 1994/09/01 00:25:35 paulus Exp $
*/ */
#include "args.h" #include "args.h"
void magic_init __ARGS((void)); /* Initialize the magic number generator */ void magic_init __ARGS((void)); /* Initialize the magic number generator */
u_long magic __ARGS((void)); /* Returns the next magic number */ uint32 magic __ARGS((void)); /* Returns the next magic number */