warning fixes

[apps/madmutt.git] / history.c

diff --git a/history.c b/history.c
index 27c345b..d61d0ce 100644 (file)
--- a/history.c
+++ b/history.c
@@ -33,13 +33,13 @@ static void init_history (struct history *h)
   if (OldSize) {
     if (h->hist) {
       for (i = 0; i < OldSize; i++)
-        FREE (&h->hist[i]);
-      FREE (&h->hist);
+        mem_free (&h->hist[i]);
+      mem_free (&h->hist);
     }
   }
 
   if (HistSize)
-    h->hist = safe_calloc (HistSize, sizeof (char *));
+    h->hist = mem_calloc (HistSize, sizeof (char *));
 
   h->cur = 0;
   h->last = 0;
@@ -70,8 +70,8 @@ void mutt_history_add (history_class_t hclass, const char *s)
     prev = h->last - 1;
     if (prev < 0)
       prev = HistSize - 1;
-    if (!h->hist[prev] || mutt_strcmp (h->hist[prev], s) != 0) {
-      mutt_str_replace (&h->hist[h->last++], s);
+    if (!h->hist[prev] || str_cmp (h->hist[prev], s) != 0) {
+      str_replace (&h->hist[h->last++], s);
       if (h->last > HistSize - 1)
         h->last = 0;
     }