diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-04-27 14:52:03 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-04-27 14:52:03 +0100 |
| commit | ed2b3ee01d71f9baa9b756155a631e9d8cfb9b55 (patch) | |
| tree | 0a63d0a988d9724ad3ff8084bced17b14816a69a | |
| parent | b4dd15a736795e6d06a79febbae76a926964bbb0 (diff) | |
tidying
| -rw-r--r-- | src/exim_monitor/em_globals.c | 14 | ||||
| -rw-r--r-- | src/src/buildconfig.c | 5 |
2 files changed, 3 insertions, 16 deletions
diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index 0a4f92e4f..925e88e05 100644 --- a/src/exim_monitor/em_globals.c +++ b/src/exim_monitor/em_globals.c @@ -220,18 +220,8 @@ int string_datestamp_type = -1; BOOL timestamps_utc = FALSE; tls_support tls_in = { - {-1}, /* tls_active */ - 0, /* bits */ - FALSE, /* tls_certificate_verified */ -#ifdef SUPPORT_DANE - FALSE, /* dane_verified */ - 0, /* tlsa_usage */ -#endif - NULL, /* tls_cipher */ - FALSE, /* tls_on_connect */ - NULL, /* tls_on_connect_ports */ - NULL, /* tls_peerdn */ - NULL /* tls_sni */ + .active = { .sock = -1 } + /* remainder zero/null/false */ }; tree_node *tree_duplicates = NULL; diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index 3d404f100..426714f91 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -953,21 +953,18 @@ else if (isgroup) defined. */ if (have_auth) - { if (!support_crypteq) fprintf(new, "/* Force SUPPORT_CRYPTEQ for AUTH */\n" "#define SUPPORT_CRYPTEQ\n"); - } /* Check poll() for timer functionality. Some OS' have released with it broken. */ { struct timeval before, after; - int rc; size_t us; gettimeofday(&before, NULL); - rc = poll(NULL, 0, 500); + (void) poll(NULL, 0, 500); gettimeofday(&after, NULL); us = (after.tv_sec - before.tv_sec) * 1000000 + |