mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
r12431: - the TIME_T_MAX needs to be a singed max value
- fix the calculation of TIME_T_MAX -> nttime -> TIME_T_MAX
metze
(This used to be commit 9caf4b9a42
)
This commit is contained in:
parent
7448b93a2e
commit
d04ef04c7a
@ -23,13 +23,26 @@
|
||||
#include "includes.h"
|
||||
#include "system/time.h"
|
||||
|
||||
#ifndef CHAR_BIT
|
||||
# define CHAR_BIT 8
|
||||
#endif
|
||||
|
||||
/* The extra casts work around common compiler bugs. */
|
||||
#define _TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
|
||||
/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
|
||||
It is necessary at least when t == time_t. */
|
||||
#define _TYPE_MINIMUM(t) ((t) (_TYPE_SIGNED (t) \
|
||||
? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
|
||||
#define _TYPE_MAXIMUM(t) ((t) (~ (t) 0 - _TYPE_MINIMUM (t)))
|
||||
|
||||
#ifndef TIME_T_MIN
|
||||
#define TIME_T_MIN 0
|
||||
#endif
|
||||
#ifndef TIME_T_MAX
|
||||
#define TIME_T_MAX (~(time_t)0)
|
||||
#define TIME_T_MAX _TYPE_MAXIMUM (time_t)
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/*******************************************************************
|
||||
External access to time_t_min and time_t_max.
|
||||
********************************************************************/
|
||||
@ -69,7 +82,7 @@ time_t nt_time_to_unix(NTTIME nt)
|
||||
nt /= 1000*1000*10;
|
||||
nt -= TIME_FIXUP_CONSTANT;
|
||||
|
||||
if (TIME_T_MIN >= nt || nt >= TIME_T_MAX) {
|
||||
if (TIME_T_MIN > nt || nt > TIME_T_MAX) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user