This wipes duplicated code, which I introduced a while ago.

diff --git a/muttlib.c b/muttlib.c
index 914d52d430343b70ceddb6a348422fdda6b2d8d2..395bde1fcb7d79caec96773562f0d46156a3ccff 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -654,7 +654,7 @@ void mutt_free_envelope (ENVELOPE **p)
   FREE (&(*p)->date);
   FREE (&(*p)->x_label);
 
-  mutt_free_buffer (&(*p)->spam);
+  mutt_buffer_free (&(*p)->spam);
 
   mutt_free_list (&(*p)->references);
   mutt_free_list (&(*p)->in_reply_to);
@@ -1344,15 +1344,6 @@ BUFFER * mutt_buffer_from(BUFFER *b, char *seed)
   return b;
 }
 
-void mutt_buffer_free(BUFFER **b)
-{
-  if (!b)
-    return;
-  if ((*b)->data)
-    safe_free(&((*b)->data));
-  safe_free(b);
-}
-
 void mutt_buffer_addstr (BUFFER* buf, const char* s)
 {
   mutt_buffer_add (buf, s, mutt_strlen (s));
@@ -1363,9 +1354,10 @@ void mutt_buffer_addch (BUFFER* buf, char c)
   mutt_buffer_add (buf, &c, 1);
 }
 
-void mutt_free_buffer (BUFFER **p)
+void mutt_buffer_free (BUFFER **p)
 {
-  if (!*p) return;
+  if (!p || !*p) 
+    return;
 
    FREE(&(*p)->data);
    /* dptr is just an offset to data and shouldn't be freed */

diff --git a/protos.h b/protos.h
index 821f731db748ae28e3a2538771460733d528da7d..a481e4f4b38f085695523034f8754c53ad2f79c7 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -38,7 +38,6 @@ void mutt_buffer_free(BUFFER **);
 void mutt_buffer_add (BUFFER*, const char*, size_t);
 void mutt_buffer_addstr (BUFFER*, const char*);
 void mutt_buffer_addch (BUFFER*, char);
-void mutt_free_buffer (BUFFER **);
 
 #define mutt_system(x) _mutt_system(x,0)
 int _mutt_system (const char *, int);