#endif
#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"
#include "compress.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include <limits.h>
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++;
strfcpy (path, pattern.data, sizeof (path));
_mutt_expand_path (path, sizeof (path), 1);
p_delete(&pattern.data);
- memset (&pattern, 0, sizeof (pattern));
- pattern.data = str_dup (path);
+ p_clear(&pattern, 1);
+ pattern.data = m_strdup(path);
}
#ifdef USE_COMPRESSED
else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) {
strfcpy (tmp, pattern.data, sizeof (tmp));
mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
p_delete(&pattern.data);
- memset (&pattern, 0, sizeof (pattern));
- pattern.data = str_dup (tmp);
+ p_clear(&pattern, 1);
+ pattern.data = m_strdup(tmp);
}
if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) {
strfcpy (path, command.data, sizeof (path));
mutt_expand_path (path, sizeof (path));
p_delete(&command.data);
- memset (&command, 0, sizeof (command));
- command.data = str_dup (path);
+ p_clear(&command, 1);
+ command.data = m_strdup(path);
}
/* check to make sure that a matching hook doesn't already exist */
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;
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;
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)))