X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=4222f522466b75afc4b08b8d4f66346c3712bad2;hp=d6db820d06568b0f6c80e0a11cb58d393cc6fc54;hb=3e611c4b53a33408955152e1c9336f8643ea096e;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd;ds=sidebyside

diff --git a/hook.c b/hook.c
index d6db820..4222f52 100644
--- a/hook.c
+++ b/hook.c
@@ -14,9 +14,9 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
 
 #include "mutt.h"
-#include "buffer.h"
 #include "mx.h"
 #include "mutt_crypt.h"
 
@@ -56,8 +56,8 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   pattern_t *pat = NULL;
   char path[_POSIX_PATH_MAX];
 
-  memset (&pattern, 0, sizeof (pattern));
-  memset (&command, 0, sizeof (command));
+  p_clear(&pattern, 1);
+  p_clear(&command, 1);
 
   if (*s->dptr == '!') {
     s->dptr++;
@@ -91,7 +91,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     strfcpy (path, pattern.data, sizeof (path));
     _mutt_expand_path (path, sizeof (path), 1);
     p_delete(&pattern.data);
-    memset (&pattern, 0, sizeof (pattern));
+    p_clear(&pattern, 1);
     pattern.data = m_strdup(path);
   }
 #ifdef USE_COMPRESSED
@@ -110,7 +110,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     strfcpy (tmp, pattern.data, sizeof (tmp));
     mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
     p_delete(&pattern.data);
-    memset (&pattern, 0, sizeof (pattern));
+    p_clear(&pattern, 1);
     pattern.data = m_strdup(tmp);
   }
 
@@ -118,7 +118,7 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
     strfcpy (path, command.data, sizeof (path));
     mutt_expand_path (path, sizeof (path));
     p_delete(&command.data);
-    memset (&command, 0, sizeof (command));
+    p_clear(&command, 1);
     command.data = m_strdup(path);
   }
 
@@ -282,7 +282,7 @@ void mutt_folder_hook (char *path)
 
   err.data = buf;
   err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
+  p_clear(&token, 1);
   for (; tmp; tmp = tmp->next) {
     if (!tmp->command)
       continue;
@@ -328,7 +328,7 @@ void mutt_message_hook (CONTEXT * ctx, HEADER * hdr, int type)
 
   err.data = buf;
   err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
+  p_clear(&token, 1);
   for (hook = Hooks; hook; hook = hook->next) {
     if (!hook->command)
       continue;
@@ -455,7 +455,7 @@ void mutt_account_hook (const char *url)
 
   err.data = buf;
   err.dsize = sizeof (buf);
-  memset (&token, 0, sizeof (token));
+  p_clear(&token, 1);
 
   for (hook = Hooks; hook; hook = hook->next) {
     if (!(hook->command && (hook->type & M_ACCOUNTHOOK)))