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
Fix build on older GnuTLS
[exim.git]
/
src
/
src
/
log.c
diff --git
a/src/src/log.c
b/src/src/log.c
index 3fdcbbee9962b97ba45397313eed124c01e60b2a..0aaf94a31fb12dd89fcc684590c63c9c45686ef8 100644
(file)
--- a/
src/src/log.c
+++ b/
src/src/log.c
@@
-112,6
+112,7
@@
static const uschar * exim_errstrings[] = {
US"Local-only delivery",
US"Domain in queue_domains",
US"Transport concurrency limit",
US"Local-only delivery",
US"Domain in queue_domains",
US"Transport concurrency limit",
+ US"Event requests alternate response",
};
};
@@
-142,7
+143,7
@@
Returns: nothing
static void
write_syslog(int priority, const uschar *s)
{
static void
write_syslog(int priority, const uschar *s)
{
-int len
, pass
;
+int len;
int linecount = 0;
if (!syslog_pid && LOGGING(pid))
int linecount = 0;
if (!syslog_pid && LOGGING(pid))
@@
-171,12
+172,10
@@
if (!syslog_open && !f.running_in_test_harness)
/* First do a scan through the message in order to determine how many lines
it is going to end up as. Then rescan to output it. */
/* First do a scan through the message in order to determine how many lines
it is going to end up as. Then rescan to output it. */
-for (pass = 0; pass < 2; pass++)
+for (
int
pass = 0; pass < 2; pass++)
{
{
- int i;
- int tlen;
const uschar * ss = s;
const uschar * ss = s;
- for (i = 1, tlen = len; tlen > 0; i++)
+ for (i
nt i
= 1, tlen = len; tlen > 0; i++)
{
int plen = tlen;
uschar *nlptr = Ustrchr(ss, '\n');
{
int plen = tlen;
uschar *nlptr = Ustrchr(ss, '\n');
@@
-736,7
+735,6
@@
Returns: nothing
void
log_write(unsigned int selector, int flags, const char *format, ...)
{
void
log_write(unsigned int selector, int flags, const char *format, ...)
{
-uschar * ptr;
int paniclogfd;
ssize_t written_len;
gstring gs = { .size = LOG_BUFFER_SIZE-1, .ptr = 0, .s = log_buffer };
int paniclogfd;
ssize_t written_len;
gstring gs = { .size = LOG_BUFFER_SIZE-1, .ptr = 0, .s = log_buffer };
@@
-1046,8
+1044,6
@@
headers. */
if (flags & LOG_REJECT)
{
if (flags & LOG_REJECT)
{
- header_line *h;
-
if (header_list && LOGGING(rejected_header))
{
uschar * p = g->s + g->ptr;
if (header_list && LOGGING(rejected_header))
{
uschar * p = g->s + g->ptr;
@@
-1088,7
+1084,7
@@
if (flags & LOG_REJECT)
/* A header with a NULL text is an unfilled in Received: header */
/* A header with a NULL text is an unfilled in Received: header */
- for (h = header_list; h; h = h->next) if (h->text)
+ for (h
eader_line * h
= header_list; h; h = h->next) if (h->text)
{
BOOL fitted = string_format(p, LOG_BUFFER_SIZE - g->ptr,
"%c %s", h->type, h->text);
{
BOOL fitted = string_format(p, LOG_BUFFER_SIZE - g->ptr,
"%c %s", h->type, h->text);