X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=history.c;h=d61d0ceeabec5401239a3f8552639d1cd9880c3f;hp=14643456d1297e67500db5d9ab521b2015f86cd5;hb=587624727b9113e58090ad51bbe35caf7d827e13;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/history.c b/history.c
index 1464345..d61d0ce 100644
--- a/history.c
+++ b/history.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #if HAVE_CONFIG_H
@@ -22,6 +13,7 @@
 
 #include "mutt.h"
 #include "history.h"
+#include "lib/mem.h"
 
 /* global vars used for the string-history routines */
 
@@ -41,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;
@@ -78,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;
     }