projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update gettext copy.
[apps/madmutt.git]
/
thread.c
diff --git
a/thread.c
b/thread.c
index
57b1bcb
..
965c897
100644
(file)
--- a/
thread.c
+++ b/
thread.c
@@
-17,7
+17,6
@@
#include "sort.h"
#include "thread.h"
#include "sort.h"
#include "thread.h"
-#include "lib/mem.h"
#include "lib/intl.h"
#include <string.h>
#include "lib/intl.h"
#include <string.h>
@@
-346,7
+345,7
@@
static LIST *make_subject_list (THREAD * cur, time_t * dateptr)
break;
}
if (!curlist || rc > 0) {
break;
}
if (!curlist || rc > 0) {
- newlist =
mem_calloc (1, sizeof (LIST)
);
+ newlist =
p_new(LIST, 1
);
newlist->data = env->real_subj;
if (oldlist) {
newlist->next = oldlist->next;
newlist->data = env->real_subj;
if (oldlist) {
newlist->next = oldlist->next;
@@
-549,7
+548,7
@@
THREAD *mutt_sort_subthreads (THREAD * thread, int init)
top = thread;
top = thread;
- array =
mem_calloc ((array_size = 256), sizeof (THREAD *
));
+ array =
p_new(THREAD *, (array_size = 256
));
while (1) {
if (init || !thread->sort_key) {
thread->sort_key = NULL;
while (1) {
if (init || !thread->sort_key) {
thread->sort_key = NULL;
@@
-581,7
+580,7
@@
THREAD *mutt_sort_subthreads (THREAD * thread, int init)
/* put them into the array */
for (i = 0; thread; i++, thread = thread->prev) {
if (i >= array_size)
/* put them into the array */
for (i = 0; thread; i++, thread = thread->prev) {
if (i >= array_size)
-
mem_realloc (&array, (array_size *= 2) * sizeof (THREAD *)
);
+
p_realloc(&array, array_size *= 2
);
array[i] = thread;
}
array[i] = thread;
}
@@
-758,7
+757,7
@@
void mutt_sort_threads (CONTEXT * ctx, int init)
else {
new = (option (OPTDUPTHREADS) ? thread : NULL);
else {
new = (option (OPTDUPTHREADS) ? thread : NULL);
- thread =
mem_calloc (1, sizeof (THREAD)
);
+ thread =
p_new(THREAD, 1
);
thread->message = cur;
thread->check_subject = 1;
cur->thread = thread;
thread->message = cur;
thread->check_subject = 1;
cur->thread = thread;
@@
-839,7
+838,7
@@
void mutt_sort_threads (CONTEXT * ctx, int init)
break;
if ((new = hash_find (ctx->thread_hash, ref->data)) == NULL) {
break;
if ((new = hash_find (ctx->thread_hash, ref->data)) == NULL) {
- new =
mem_calloc (1, sizeof (THREAD)
);
+ new =
p_new(THREAD, 1
);
hash_insert (ctx->thread_hash, ref->data, new, 1);
}
else {
hash_insert (ctx->thread_hash, ref->data, new, 1);
}
else {