Avoid manually-counted long strings

diff --git a/src/src/expand.c b/src/src/expand.c
index 9bb30de4f3f8f5514c42f4e0ee13f89684b72c1b..21758d832c559aae546d484273e3174bf21db405 100644 (file)
--- 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 da6d23602c02b864c713095bb953449d0304554f..cf6271c6033c2510821bacd2b26299ab10c36f39 100644 (file)
--- 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);