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

[apps/madmutt.git] / imap / utf7.c

diff --git a/imap/utf7.c b/imap/utf7.c
index 7eeed83..76ea696 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -17,8 +17,6 @@
 #include "charset.h"
 #include "imap_private.h"
 
-#include "lib/mem.h"
-
 static int Index_64[128] = {
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -115,7 +113,7 @@ static char *utf7_to_utf8 (const char *u7, size_t u7len, char **u8,
   if (u8len)
     *u8len = p - buf;
 
-  mem_realloc (&buf, p - buf);
+  p_realloc(&buf, p - buf);
   if (u8)
     *u8 = buf;
   return buf;
@@ -221,7 +219,7 @@ static char *utf8_to_utf7 (const char *u8, size_t u8len, char **u7,
   *p++ = '\0';
   if (u7len)
     *u7len = p - buf;
-  mem_realloc (&buf, p - buf);
+  p_realloc(&buf, p - buf);
   if (u7)
     *u7 = buf;
   return buf;
@@ -234,7 +232,7 @@ bail:
 void imap_utf7_encode (char **s)
 {
   if (Charset) {
-    char *t = str_dup (*s);
+    char *t = m_strdup(*s);
 
     if (!mutt_convert_string (&t, Charset, "UTF-8", 0)) {
       char *u7 = utf8_to_utf7 (t, strlen (t), NULL, 0);
@@ -248,7 +246,7 @@ void imap_utf7_encode (char **s)
 void imap_utf7_decode (char **s)
 {
   if (Charset) {
-    char *t = utf7_to_utf8 (*s, str_len (*s), 0, 0);
+    char *t = utf7_to_utf8 (*s, m_strlen(*s), 0, 0);
 
     if (t && !mutt_convert_string (&t, "UTF-8", Charset, 0)) {
       p_delete(s);