Rocco Rutte:

[apps/madmutt.git] / rfc1524.c

diff --git a/rfc1524.c b/rfc1524.c
index 9bab71b..220beeb 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -24,6 +24,11 @@
 #include "mutt.h"
 #include "rfc1524.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/debug.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -123,19 +128,19 @@ static char *get_field (char *s)
       break;
     }
   }
-  mutt_remove_trailing_ws (s);
+  str_skip_trailws (s);
   return ch;
 }
 
 static int get_field_text (char *field, char **entry,
                            char *type, char *filename, int line)
 {
-  field = mutt_skip_whitespace (field);
+  field = str_skip_initws (field);
   if (*field == '=') {
     if (entry) {
       field++;
-      field = mutt_skip_whitespace (field);
-      mutt_str_replace (entry, field);
+      field = str_skip_initws (field);
+      str_replace (entry, field);
     }
     return 1;
   }
@@ -184,7 +189,7 @@ static int rfc1524_mailcap_parse (BODY * a,
       /* ignore comments */
       if (*buf == '#')
         continue;
-      dprint (2, (debugfile, "mailcap entry: %s\n", buf));
+      debug_print (2, ("mailcap entry: %s\n", buf));
 
       /* check type */
       ch = get_field (buf);
@@ -208,7 +213,7 @@ static int rfc1524_mailcap_parse (BODY * a,
       while (ch) {
         field = ch;
         ch = get_field (ch);
-        dprint (2, (debugfile, "field: %s\n", field));
+        debug_print (2, ("field: %s\n", field));
 
         if (!ascii_strcasecmp (field, "needsterminal")) {
           if (entry)
@@ -372,7 +377,7 @@ int rfc1524_mailcap_lookup (BODY * a, char *type, rfc1524_entry * entry,
     path[x] = '\0';
     mutt_expand_path (path, sizeof (path));
 
-    dprint (2, (debugfile, "Checking mailcap file: %s\n", path));
+    debug_print (2, ("Checking mailcap file: %s\n", path));
     found = rfc1524_mailcap_parse (a, path, type, entry, opt);
   }