use safer p_clear when possible.

[apps/madmutt.git] / buffer.c

diff --git a/buffer.c b/buffer.c
index 7f06132..e16b590 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -30,16 +30,12 @@
  */
 BUFFER *mutt_buffer_init(BUFFER *b)
 {
-  if (!b) {
-    b = p_new(BUFFER, 1);
-    if (!b)
-      return NULL;
-  }
-  else {
+    if (!b) {
+        b = p_new(BUFFER, 1);
+    }
     p_delete(&b->data);
-  }
-  memset (b, 0, sizeof (BUFFER));
-  return b;
+    p_clear(b, 1);
+    return b;
 }
 
 /*
@@ -213,7 +209,7 @@ int mutt_extract_token (BUFFER * dest, BUFFER * tok, int flags)
       tok->dptr = pc + 1;
 
       /* read line */
-      memset (&expn, 0, sizeof (expn));
+      p_clear(&expn, 1);
       expn.data = mutt_read_line (NULL, &expn.dsize, fp, &line);
       fclose (fp);
       mutt_wait_filter (pid);