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
Tidying and compiler-silencing
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index 0a0ed8a342b6ce60c2b1ebed92f245312c44c287..1f60042ff8ab53c3837333552a18fc0e813fde39 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-1095,7
+1095,7
@@
static uschar buf[sizeof("0.000s")];
if (diff->tv_sec >= 5 || !LOGGING(millisec))
return readconf_printtime((int)diff->tv_sec);
if (diff->tv_sec >= 5 || !LOGGING(millisec))
return readconf_printtime((int)diff->tv_sec);
-sprintf(CS buf, "%
d.%03ds", (int)diff->tv_sec, (
int)diff->tv_usec/1000);
+sprintf(CS buf, "%
u.%03us", (uint)diff->tv_sec, (u
int)diff->tv_usec/1000);
return buf;
}
return buf;
}
@@
-8597,6
+8597,7
@@
else
}
return; /* compiler quietening; control does not reach here. */
}
return; /* compiler quietening; control does not reach here. */
+#ifdef SUPPORT_TLS
fail:
log_write(0,
LOG_MAIN | (exec_type == CEE_EXEC_EXIT ? LOG_PANIC : LOG_PANIC_DIE),
fail:
log_write(0,
LOG_MAIN | (exec_type == CEE_EXEC_EXIT ? LOG_PANIC : LOG_PANIC_DIE),
@@
-8606,6
+8607,7
@@
fail:
Note: this must be _exit(), not exit(). */
_exit(EX_EXECFAILED);
Note: this must be _exit(), not exit(). */
_exit(EX_EXECFAILED);
+#endif
}
/* vi: aw ai sw=2
}
/* vi: aw ai sw=2