#endif
#include "sidebar.h"
-#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/list.h"
{
if (state->entrylen == state->entrymax) {
/* need to allocate more space */
- mem_realloc (&state->entry,
- sizeof (struct folder_file) * (state->entrymax += 256));
- memset (&state->entry[state->entrylen], 0,
- sizeof (struct folder_file) * 256);
+ p_realloc(&state->entry, state->entrymax += 256);
+ p_clear(&state->entry[state->entrylen], 256);
if (m)
m->data = state->entry;
}
if (s != NULL) {
- (state->entry)[state->entrylen].mode = s->st_mode;
+ (state->entry)[state->entrylen].mode = s->st_mode;
(state->entry)[state->entrylen].mtime = s->st_mtime;
- (state->entry)[state->entrylen].size = s->st_size;
-
- (state->entry)[state->entrylen].st = p_new(struct stat, 1);
- memcpy ((state->entry)[state->entrylen].st, s, sizeof (struct stat));
+ (state->entry)[state->entrylen].size = s->st_size;
+ (state->entry)[state->entrylen].st = p_dup(s, 1);
}
(state->entry)[state->entrylen].new = new;
{
state->entrylen = 0;
state->entrymax = 256;
- state->entry =
- (struct folder_file *) mem_calloc (state->entrymax,
- sizeof (struct folder_file));
+ state->entry = p_new(struct folder_file, state->entrymax);
#ifdef USE_IMAP
state->imap_browse = 0;
#endif
if (menu->tagged) {
*numfiles = menu->tagged;
- tfiles = mem_calloc (*numfiles, sizeof (char *));
+ tfiles = p_new(char *, *numfiles);
for (i = 0, j = 0; i < state.entrylen; i++) {
struct folder_file ff = state.entry[i];
char full[_POSIX_PATH_MAX];
}
else if (f[0]) { /* no tagged entries. return selected entry */
*numfiles = 1;
- tfiles = mem_calloc (*numfiles, sizeof (char *));
+ tfiles = p_new(char *, *numfiles);
mutt_expand_path (f, flen);
tfiles[0] = str_dup (f);
*files = tfiles;