X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=3551aaf3680697c7c36fd9e99ceec45116bed0a4;hp=63399e432957d9f6649c938ad7c008093553211e;hb=fdb93a08e305b8755260144807e4d45106a9cb9f;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/sendlib.c b/sendlib.c
index 63399e4..3551aaf 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -625,7 +625,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
     ib = bufi;
     ob = bufu, obl = sizeof (bufu);
     n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
-    assert (n == -1 || !n || ICONV_NONTRANS);
+    assert (n == -1 || !n);
     if (n == -1 &&
         ((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
       assert (errno == EILSEQ ||
@@ -826,7 +826,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
         convert_file_from_to (fp, fchs, chs ? chs : SendCharset,
                               &fromcode, &tocode, info) != -1) {
       if (!chs) {
-        mutt_canonical_charset (chsbuf, sizeof (chsbuf), tocode);
+        charset_canonicalize (chsbuf, sizeof (chsbuf), tocode);
         mutt_set_parameter ("charset", chsbuf, &b->parameter);
       }
       b->file_charset = fromcode;
@@ -846,7 +846,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
   if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
     mutt_set_parameter ("charset", (!info->hibin ? "us-ascii" :
                                     Charset
-                                    && !mutt_is_us_ascii (Charset) ? Charset :
+                                    && !charset_is_us_ascii (Charset) ? Charset :
                                     "unknown-8bit"), &b->parameter);
 
   return info;
@@ -1136,7 +1136,7 @@ char *mutt_get_body_charset (char *d, ssize_t dlen, BODY * b)
     p = mutt_get_parameter ("charset", b->parameter);
 
   if (p)
-    mutt_canonical_charset (d, dlen, NONULL (p));
+    charset_canonicalize (d, dlen, NONULL (p));
   else
     m_strcpy(d, dlen, "us-ascii");
 
@@ -1151,7 +1151,7 @@ void mutt_update_encoding (BODY * a)
   char chsbuff[STRING];
 
   /* override noconv when it's us-ascii */
-  if (mutt_is_us_ascii (mutt_get_body_charset (chsbuff, sizeof (chsbuff), a)))
+  if (charset_is_us_ascii (mutt_get_body_charset (chsbuff, sizeof (chsbuff), a)))
     a->noconv = 0;
 
   if (!a->force_charset && !a->noconv)