From c86cd3103d043eafe748934c5f79b819505b03e9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 28 Oct 2020 00:43:53 +0000 Subject: [PATCH] Avoid manually-counted long strings --- src/src/expand.c | 4 ++-- src/src/smtp_in.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/src/expand.c b/src/src/expand.c index 9bb30de4f..21758d832 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1708,9 +1708,9 @@ authres_iprev(gstring * g) if (sender_host_name) g = string_append(g, 3, US";\n\tiprev=pass (", sender_host_name, US")"); else if (host_lookup_deferred) - g = string_catn(g, US";\n\tiprev=temperror", 19); + g = string_cat(g, US";\n\tiprev=temperror"); else if (host_lookup_failed) - g = string_catn(g, US";\n\tiprev=fail", 13); + g = string_cat(g, US";\n\tiprev=fail"); else return g; diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index da6d23602..cf6271c60 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -5899,7 +5899,7 @@ if (Ustrcmp(sender_host_auth_pubname, "tls") != 0) else if (authenticated_id) g = string_append(g, 2, US") x509.auth=", authenticated_id); else - g = string_catn(g, US") reason=x509.auth", 17); + g = string_cat(g, US") reason=x509.auth"); if (authenticated_sender) g = string_append(g, 2, US" smtp.mailfrom=", authenticated_sender); -- 2.30.2