From fe52bf9a01ad0bec838e7b71fe2e129a4606217b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Tue, 16 Mar 2010 23:05:22 +0000
Subject: [PATCH] * CtdlOutputPreLoadedMsg: use length calculated by
 safestrncpy instead of doing strlen on each loop iteration

---
 citadel/msgbase.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 77b020b95..1d411f4c9 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1722,7 +1722,7 @@ int CtdlOutputPreLoadedMsg(
 		int crlf,		/* Use CRLF newlines instead of LF? */
 		int flags		/* should the bessage be exported clean? */
 ) {
-	int i, j, k;
+	int i, j, k, n;
 	char buf[SIZ];
 	cit_uint8_t ch, prev_ch;
 	char allkeys[30];
@@ -1874,8 +1874,8 @@ int CtdlOutputPreLoadedMsg(
 		}
 
 		/* Now spew the header fields in the order we like them. */
-		safestrncpy(allkeys, FORDER, sizeof allkeys);
-		for (i=0; i<strlen(allkeys); ++i) {
+		n = safestrncpy(allkeys, FORDER, sizeof allkeys);
+		for (i=0; i<n; ++i) {
 			k = (int) allkeys[i];
 			if (k != 'M') {
 				if ( (TheMessage->cm_fields[k] != NULL)
-- 
2.39.2