From 299a211b8d37f29f6895d545bb0b7d18e2979072 Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 13 Mar 2007 10:58:34 +0100
Subject: [PATCH] Clean up the strcat cleanup

---
 charset.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/charset.c b/charset.c
index 8d483c97c..7cb9da51c 100644
--- a/charset.c
+++ b/charset.c
@@ -245,9 +245,10 @@ void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
   char *p;
   char scratch[LONG_STRING];
 
-  if (!ascii_strcasecmp (name, "utf-8")) {
-    strfcpy (dest, name, dlen);
-    goto found_utf8;
+  if (!ascii_strcasecmp (name, "utf-8")) 
+  {
+    strfcpy (dest, "utf-8", dlen);
+    return;
   }
 
   /* catch some common iso-8859-something misspellings */
@@ -272,7 +273,6 @@ void mutt_canonical_charset (char *dest, size_t dlen, const char *name)
 
   strfcpy (dest, scratch, dlen);
 
-found_utf8:
   /* for cosmetics' sake, transform to lowercase. */
   for (p = dest; *p; p++)
     *p = ascii_tolower (*p);
-- 
2.50.1