From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 13 Mar 2007 09:58:34 +0000 (+0100)
Subject: Clean up the strcat cleanup
X-Git-Tag: mutt-1-5-15-rel~47^2~18^2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e0a9d3fb3bb3ae353b2769b0051b0cf8e34222d;p=mutt

Clean up the strcat cleanup
---

diff --git a/charset.c b/charset.c
index 8d483c97..7cb9da51 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);