projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move ascii.* into the lib-lib.
[apps/madmutt.git]
/
hook.c
diff --git
a/hook.c
b/hook.c
index
d665cb3
..
d6db820
100644
(file)
--- a/
hook.c
+++ b/
hook.c
@@
-12,6
+12,8
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "mutt.h"
#include "buffer.h"
@@
-22,9
+24,6
@@
#include "compress.h"
#endif
#include "compress.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include <limits.h>
#include "lib/rx.h"
#include <limits.h>
@@
-93,7
+92,7
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
_mutt_expand_path (path, sizeof (path), 1);
p_delete(&pattern.data);
memset (&pattern, 0, sizeof (pattern));
_mutt_expand_path (path, sizeof (path), 1);
p_delete(&pattern.data);
memset (&pattern, 0, sizeof (pattern));
- pattern.data =
str_dup
(path);
+ pattern.data =
m_strdup
(path);
}
#ifdef USE_COMPRESSED
else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) {
}
#ifdef USE_COMPRESSED
else if (data & (M_APPENDHOOK | M_OPENHOOK | M_CLOSEHOOK)) {
@@
-112,7
+111,7
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
p_delete(&pattern.data);
memset (&pattern, 0, sizeof (pattern));
mutt_check_simple (tmp, sizeof (tmp), DefaultHook);
p_delete(&pattern.data);
memset (&pattern, 0, sizeof (pattern));
- pattern.data =
str_dup
(tmp);
+ pattern.data =
m_strdup
(tmp);
}
if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) {
}
if (data & (M_MBOXHOOK | M_SAVEHOOK | M_FCCHOOK)) {
@@
-120,7
+119,7
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
mutt_expand_path (path, sizeof (path));
p_delete(&command.data);
memset (&command, 0, sizeof (command));
mutt_expand_path (path, sizeof (path));
p_delete(&command.data);
memset (&command, 0, sizeof (command));
- command.data =
str_dup
(path);
+ command.data =
m_strdup
(path);
}
/* check to make sure that a matching hook doesn't already exist */
}
/* check to make sure that a matching hook doesn't already exist */
@@
-186,11
+185,11
@@
int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
}
if (ptr) {
}
if (ptr) {
- ptr->next =
mem_calloc (1, sizeof (HOOK)
);
+ ptr->next =
p_new(HOOK, 1
);
ptr = ptr->next;
}
else
ptr = ptr->next;
}
else
- Hooks = ptr =
mem_calloc (1, sizeof (HOOK)
);
+ Hooks = ptr =
p_new(HOOK, 1
);
ptr->type = data;
ptr->command = command.data;
ptr->pattern = pat;
ptr->type = data;
ptr->command = command.data;
ptr->pattern = pat;