X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=history.c;h=66559c05ad9749f8fb607439a501be8cf3d2db71;hp=ba01d514bb51d64789e2b6644d05b144dc04f8cd;hb=4eaac5c4a87b84ea9ec0668b4e088ac27e2d1106;hpb=96d53ff49c308769efbf708e1e65819077cb7af6 diff --git a/history.c b/history.c index ba01d51..66559c0 100644 --- 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,7 +70,7 @@ 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) { + 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; @@ -79,7 +79,7 @@ void mutt_history_add (history_class_t hclass, const char *s) h->cur = h->last; /* reset to the last entry */ } -char *mutt_history_next (history_class_t hclass) +const char *mutt_history_next (history_class_t hclass) { int next; struct history *h = &History[hclass]; @@ -94,7 +94,7 @@ char *mutt_history_next (history_class_t hclass) return (h->hist[h->cur] ? h->hist[h->cur] : ""); } -char *mutt_history_prev (history_class_t hclass) +const char *mutt_history_prev (history_class_t hclass) { int prev; struct history *h = &History[hclass];