remove yet anoter round of str_* functions, replaced with their inlineable

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index a461354..add4d74 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -121,11 +121,11 @@ static void encode_quoted (FGETCONV * fc, FILE * fout, int istext)
     }
 
     /* Escape lines that begin with/only contain "the message separator". */
-    if (linelen == 4 && !str_ncmp ("From", line, 4)) {
+    if (linelen == 4 && !m_strncmp("From", line, 4)) {
       strfcpy (line, "=46rom", sizeof (line));
       linelen = 6;
     }
-    else if (linelen == 4 && !str_ncmp ("from", line, 4)) {
+    else if (linelen == 4 && !m_strncmp("from", line, 4)) {
       strfcpy (line, "=66rom", sizeof (line));
       linelen = 6;
     }
@@ -937,7 +937,7 @@ int mutt_lookup_mime_type (BODY * att, const char *path)
         while ((p = strtok (p, " \t\n"))) {
           sze = m_strlen(p);
           if ((sze > cur_sze) && (szf >= sze) &&
-              (str_casecmp (path + szf - sze, p) == 0
+              (m_strcasecmp(path + szf - sze, p) == 0
                || ascii_strcasecmp (path + szf - sze, p) == 0) && (szf == sze
                                                                    || path[szf
                                                                            -