[exim-cvs] compiler quietening

Gitweb: https://git.exim.org/exim.git/commitdiff/69be76c33eb2bdbc5c4cfb7215446d53d38534d0

Commit:     69be76c33eb2bdbc5c4cfb7215446d53d38534d0
Parent:     31d87352f9508ba8e570d2462667907d8979b93d
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Sep 16 12:18:13 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Mon Sep 16 12:18:13 2024 +0100

    compiler quietening
---
 src/src/readconf.c | 20 +++++++++++---------
 src/src/route.c    | 14 +++++++-------
 src/src/version.c  | 24 +++++++++++++-----------
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 3f49691e4..5ef776fea 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3760,7 +3760,9 @@ init_driver(driver_instance * d, driver_info ** info_anchor,
{
driver_info * di;
int len;
+#ifdef LOOKUP_MODULE_DIR
DIR * dd;
+#endif

/* First scan the list of driver seen so far. */

@@ -4356,44 +4358,44 @@ int old_pool = store_pool;
store_pool = POOL_PERM;
{
driver_info ** anchor = (driver_info **) &auths_available;
- extern auth_info cram_md5_auth_info;
- extern auth_info cyrus_sasl_auth_info;
- extern auth_info dovecot_auth_info;
- extern auth_info external_auth_info;
- extern auth_info gsasl_auth_info;
- extern auth_info heimdal_gssapi_auth_info;
- extern auth_info plaintext_auth_info;
- extern auth_info spa_auth_info;
- extern auth_info tls_auth_info;

/* Add the transport drivers that are built for static linkage to the
list of availables. */

#if defined(AUTH_CRAM_MD5) && AUTH_CRAM_MD5!=2
+ extern auth_info cram_md5_auth_info;
add_driver_info(anchor, &cram_md5_auth_info.drinfo, sizeof(auth_info));
#endif
#if defined(AUTH_CYRUS_SASL) && AUTH_CYRUS_SASL!=2
+ extern auth_info cyrus_sasl_auth_info;
add_driver_info(anchor, &cyrus_sasl_auth_info.drinfo, sizeof(auth_info));
#endif
#if defined(AUTH_DOVECOT) && AUTH_DOVECOT!=2
+ extern auth_info dovecot_auth_info;
add_driver_info(anchor, &dovecot_auth_info.drinfo, sizeof(auth_info));
#endif
#if defined(AUTH_EXTERNAL) && AUTH_EXTERNAL!=2
+ extern auth_info external_auth_info;
add_driver_info(anchor, &external_auth_info.drinfo, sizeof(auth_info));
#endif
#if defined(AUTH_GSASL) && AUTH_GSASL!=2
+ extern auth_info gsasl_auth_info;
add_driver_info(anchor, &gsasl_auth_info.drinfo, sizeof(auth_info));
#endif
#if defined(AUTH_HEIMDAL_GSSAPI) && AUTH_HEIMDAL_GSSAPI!=2
+ extern auth_info heimdal_gssapi_auth_info;
add_driver_info(anchor, &heimdal_gssapi_auth_info.drinfo, sizeof(auth_info));
#endif
#if defined(AUTH_PLAINTEXT) && AUTH_PLAINTEXT!=2
+ extern auth_info plaintext_auth_info;
add_driver_info(anchor, &plaintext_auth_info.drinfo, sizeof(auth_info));
#endif
#if defined(AUTH_SPA) && AUTH_SPA!=2
+ extern auth_info spa_auth_info;
add_driver_info(anchor, &spa_auth_info.drinfo, sizeof(auth_info));
#endif
#if defined(AUTH_TLS) && AUTH_TLS!=2
+ extern auth_info tls_auth_info;
add_driver_info(anchor, &tls_auth_info.drinfo, sizeof(auth_info));
#endif
}
diff --git a/src/src/route.c b/src/src/route.c
index 293d21c50..a54a7e84d 100644
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -231,36 +231,36 @@ int old_pool = store_pool;
store_pool = POOL_PERM;
{
driver_info ** anchor = (driver_info **) &routers_available;
- extern router_info accept_router_info;
- extern router_info dnslookup_router_info;
- extern router_info ipliteral_router_info;
- extern router_info iplookup_router_info;
- extern router_info manualroute_router_info;
- extern router_info redirect_router_info;
- extern router_info queryprogram_router_info;

/* Add the router drivers that are built for static linkage to the
list of availables. */

#if defined(ROUTER_ACCEPT) && ROUTER_ACCEPT!=2
+ extern router_info accept_router_info;
add_driver_info(anchor, &accept_router_info.drinfo, sizeof(router_info));
#endif
#if defined(ROUTER_DNSLOOKUP) && ROUTER_DNSLOOKUP!=2
+ extern router_info dnslookup_router_info;
add_driver_info(anchor, &dnslookup_router_info.drinfo, sizeof(router_info));
#endif
# if defined(ROUTER_IPLITERAL) && ROUTER_IPLITERAL!=2
+ extern router_info ipliteral_router_info;
add_driver_info(anchor, &ipliteral_router_info.drinfo, sizeof(router_info));
#endif
#if defined(ROUTER_IPLOOKUP) && ROUTER_IPLOOKUP!=2
+ extern router_info iplookup_router_info;
add_driver_info(anchor, &iplookup_router_info.drinfo, sizeof(router_info));
#endif
#if defined(ROUTER_MANUALROUTE) && ROUTER_MANUALROUTE!=2
+ extern router_info manualroute_router_info;
add_driver_info(anchor, &manualroute_router_info.drinfo, sizeof(router_info));
#endif
#if defined(ROUTER_REDIRECT) && ROUTER_REDIRECT!=2
+ extern router_info redirect_router_info;
add_driver_info(anchor, &redirect_router_info.drinfo, sizeof(router_info));
#endif
#if defined(ROUTER_QUERYPROGRAM) && ROUTER_QUERYPROGRAM!=2
+ extern router_info queryprogram_router_info;
add_driver_info(anchor, &queryprogram_router_info.drinfo, sizeof(router_info));
#endif
}
diff --git a/src/src/version.c b/src/src/version.c
index 2637ee94a..e40b38fb8 100644
--- a/src/src/version.c
+++ b/src/src/version.c
@@ -25,7 +25,6 @@ version_init(void)
static uschar cnumber_buffer[24];
static uschar date_buffer[32];

-uschar today[20];
uschar *version_cnumber_format;

int cnumber =
@@ -52,17 +51,20 @@ version_date[0] = 0;
Ustrncat(version_date, EXIM_BUILD_DATE_OVERRIDE, sizeof(date_buffer));

#else
-Ustrcpy(today, US __DATE__);
-if (today[4] == ' ') today[4] = '0';
-today[3] = today[6] = '-';
+ {
+ uschar today[20];
+ Ustrcpy(today, US __DATE__);
+ if (today[4] == ' ') today[4] = '0';
+ today[3] = today[6] = '-';

-version_date = date_buffer;
-version_date[0] = 0;
-Ustrncat(version_date, today+4, 3);
-Ustrncat(version_date, today, 4);
-Ustrncat(version_date, today+7, 4);
-Ustrcat(version_date, US" ");
-Ustrcat(version_date, US __TIME__);
+ version_date = date_buffer;
+ version_date[0] = 0;
+ Ustrncat(version_date, today+4, 3);
+ Ustrncat(version_date, today, 4);
+ Ustrncat(version_date, today+7, 4);
+ Ustrcat(version_date, US" ");
+ Ustrcat(version_date, US __TIME__);
+ }
#endif
}


--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/