projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit mem_realloc, enters p_realloc/xrealloc.
[apps/madmutt.git]
/
alias.c
diff --git
a/alias.c
b/alias.c
index
65fa634
..
48e76c5
100644
(file)
--- a/
alias.c
+++ b/
alias.c
@@
-14,7
+14,8
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
-#include "lib/mem.h"
+#include <lib-lib/mem.h>
+
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
@@
-37,7
+38,7
@@
static struct mapping_t AliasHelp[] = {
{N_("Undel"), OP_UNDELETE},
{N_("Select"), OP_GENERIC_SELECT_ENTRY},
{N_("Help"), OP_HELP},
{N_("Undel"), OP_UNDELETE},
{N_("Select"), OP_GENERIC_SELECT_ENTRY},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL
, OP_NULL
}
};
ADDRESS *mutt_lookup_alias (const char *s)
};
ADDRESS *mutt_lookup_alias (const char *s)
@@
-73,7
+74,7
@@
static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
}
if (!i) {
}
if (!i) {
- u =
mem_malloc (sizeof (LIST)
);
+ u =
p_new(LIST, 1
);
u->data = str_dup (a->mailbox);
u->next = *expn;
*expn = u;
u->data = str_dup (a->mailbox);
u->next = *expn;
*expn = u;
@@
-174,10
+175,10
@@
static void write_safe_address (FILE * fp, char *s)
}
}
}
}
-ADDRESS *mutt_get_address (ENVELOPE * env, char **pfxp)
+ADDRESS *mutt_get_address (ENVELOPE * env, c
onst c
har **pfxp)
{
ADDRESS *adr;
{
ADDRESS *adr;
- char *pfx = NULL;
+ c
onst c
har *pfx = NULL;
if (mutt_addr_is_user (env->from)) {
if (env->to && !mutt_is_mail_list (env->to)) {
if (mutt_addr_is_user (env->from)) {
if (env->to && !mutt_is_mail_list (env->to)) {
@@
-254,7
+255,7
@@
retry_name:
}
}
}
}
- new =
mem_calloc (1, sizeof (ALIAS)
);
+ new =
p_new(ALIAS, 1
);
new->self = new;
new->name = str_dup (buf);
new->self = new;
new->name = str_dup (buf);
@@
-430,9
+431,9
@@
int mutt_alias_complete (char *s, size_t buflen)
while (a) {
if (a->name && (strstr (a->name, s) == a->name)) {
if (!a_list) /* init */
while (a) {
if (a->name && (strstr (a->name, s) == a->name)) {
if (!a_list) /* init */
- a_cur = a_list =
(ALIAS *) mem_malloc (sizeof (ALIAS)
);
+ a_cur = a_list =
p_new(ALIAS, 1
);
else {
else {
- a_cur->next =
(ALIAS *) mem_malloc (sizeof (ALIAS)
);
+ a_cur->next =
p_new(ALIAS, 1
);
a_cur = a_cur->next;
}
memcpy (a_cur, a, sizeof (ALIAS));
a_cur = a_cur->next;
}
memcpy (a_cur, a, sizeof (ALIAS));
@@
-452,7
+453,7
@@
int mutt_alias_complete (char *s, size_t buflen)
while (a_list) {
a_cur = a_list;
a_list = a_list->next;
while (a_list) {
a_cur = a_list;
a_list = a_list->next;
-
mem_free
(&a_cur);
+
p_delete
(&a_cur);
}
/* remove any aliases marked for deletion */
}
/* remove any aliases marked for deletion */
@@
-666,7
+667,7
@@
new_aliases:
menu->max++;
}
menu->max++;
}
-
mem_realloc (&AliasTable, menu->max * sizeof (ALIAS *)
);
+
p_realloc(&AliasTable, menu->max
);
menu->data = AliasTable;
for (i = omax, aliasp = aliases; aliasp; aliasp = aliasp->next, i++) {
menu->data = AliasTable;
for (i = omax, aliasp = aliases; aliasp; aliasp = aliasp->next, i++) {
@@
-730,6
+731,6
@@
new_aliases:
}
mutt_menuDestroy (&menu);
}
mutt_menuDestroy (&menu);
-
mem_free
(&AliasTable);
+
p_delete
(&AliasTable);
}
}