git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TLS: PIPELINING under OpenSSL
[exim.git]
/
src
/
src
/
tod.c
diff --git
a/src/src/tod.c
b/src/src/tod.c
index 9aa845c822b706596a3653ecd0450de460f7213a..5f451ba96de445e6b52a60b01f5a04a9ed4bc8dd 100644
(file)
--- a/
src/src/tod.c
+++ b/
src/src/tod.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
09
*/
+/* Copyright (c) University of Cambridge 1995 - 20
14
*/
/* See the file NOTICE for conditions of use and distribution. */
/* A function for returning the time of day in various formats */
/* See the file NOTICE for conditions of use and distribution. */
/* A function for returning the time of day in various formats */
@@
-59,7
+59,8
@@
if (type == tod_epoch_l)
{
struct timeval tv;
gettimeofday(&tv, NULL);
{
struct timeval tv;
gettimeofday(&tv, NULL);
- (void) sprintf(CS timebuf, "%ld%06ld", tv.tv_sec, tv.tv_usec ); /* Unix epoch/usec format */
+ /* Unix epoch/usec format */
+ (void) sprintf(CS timebuf, TIME_T_FMT "%06ld", tv.tv_sec, (long) tv.tv_usec );
return timebuf;
}
return timebuf;
}
@@
-73,8
+74,8
@@
if (type == tod_log) type = log_timezone? tod_log_zone : tod_log_bare;
else if (type == tod_epoch)
{
else if (type == tod_epoch)
{
- (void) sprintf(CS timebuf,
"%d", (int)
now); /* Unix epoch format */
- return timebuf;
+ (void) sprintf(CS timebuf,
TIME_T_FMT,
now); /* Unix epoch format */
+ return timebuf;
/* NB the above will be wrong if time_t is FP */
}
else if (type == tod_zulu)
}
else if (type == tod_zulu)