mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some minor cleanup...

Browse Source
This commit is contained in:
Kurt Zeilenga 2001-12-05 06:00:57 +00:00
parent 524c139d7c
commit 8c0de8326f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/liblutil/uuid.c
View File

@ -205,14 +205,20 @@ lutil_uuidstr( char *buf, size_t len )
struct timeval tv; struct timeval tv;
unsigned long long tl; unsigned long long tl;
unsigned char *nl; unsigned char *nl;
unsigned short sq, t2, t3, s1, n1, n2, n3; unsigned short t2, t3, s1, n1, n2, n3;
unsigned int t1; unsigned int t1;
/* /*
* Theoretically we should delay if seq wraps within 100usec but for now * Theoretically we should delay if seq wraps within 100usec but for now
* systems are not fast enough to worry about it. * systems are not fast enough to worry about it.
*/ */
static unsigned short seq = 0; static int inited = 0;
static unsigned short seq;
if (!inited) {
lutil_entropy( &seq, sizeof(seq) );
inited++;
}
#ifdef HAVE_GETTIMEOFDAY #ifdef HAVE_GETTIMEOFDAY
gettimeofday( &tv, 0 ); gettimeofday( &tv, 0 );
@ -224,15 +230,10 @@ lutil_uuidstr( char *buf, size_t len )
tl = ( tv.tv_sec * 10000000LL ) + ( tv.tv_usec * 10LL ) + UUID_TPLUS; tl = ( tv.tv_sec * 10000000LL ) + ( tv.tv_usec * 10LL ) + UUID_TPLUS;
nl = lutil_eaddr(); nl = lutil_eaddr();
if (! seq) {
lutil_entropy( &seq, sizeof(seq) );
}
sq = ++seq;
t1 = tl & 0xffffffff; /* time_low */ t1 = tl & 0xffffffff; /* time_low */
t2 = ( tl >> 32 ) & 0xffff; /* time_mid */ t2 = ( tl >> 32 ) & 0xffff; /* time_mid */
t3 = ( tl >> 48 ) & 0x0fff | 0x1000; /* time_hi_and_version */ t3 = ( tl >> 48 ) & 0x0fff | 0x1000; /* time_hi_and_version */
s1 = (sq & 0x1fff ) | 0x8000; /* clock_seq_and_reserved */ s1 = ( ++seq & 0x1fff ) | 0x8000; /* clock_seq_and_reserved */
t1 = snprintf( buf, len, t1 = snprintf( buf, len,
"%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x", "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x",