#include <config.h>
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "sort.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <unistd.h>
* -2 - invalid command or execution error,
* -3 - error in funct(*line, *data).
*/
-static int mutt_nntp_fetch (NNTP_DATA * nntp_data, char *query, char *msg,
+static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
progress_t* bar, int (*funct) (char *, void *),
void *data, int tagged)
{
ret = 0;
line = 0;
- inbuf = mem_malloc (sizeof (buf));
+ inbuf = p_new(char, sizeof(buf));
FOREVER {
chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
lenbuf = 0;
}
- mem_realloc (&inbuf, lenbuf + sizeof (buf));
+ p_realloc(&inbuf, lenbuf + sizeof (buf));
}
- mem_free (&inbuf);
+ p_delete(&inbuf);
funct (NULL, data);
}
while (!done);
debug_print (2, ("group: %s, desc: %s\n", line, d));
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
str_cmp (d, data->desc)) {
- mem_free (&data->desc);
+ p_delete(&data->desc);
data->desc = str_dup (d);
}
return 0;
#undef news
}
-static void nntp_get_desc (NNTP_DATA * data, char *mask, char *msg, progress_t* bar)
+static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progress_t* bar)
{
char buf[STRING];
hdr->received = hdr->date_sent;
break;
case 4:
- mem_free (&hdr->env->message_id);
+ p_delete(&hdr->env->message_id);
hdr->env->message_id = str_dup (b);
break;
case 5:
break;
case 8:
if (!hdr->read)
- mem_free (&hdr->env->xref);
+ p_delete(&hdr->env->xref);
b = b + 6; /* skips the "Xref: " */
hdr->env->xref = str_dup (b);
nntp_parse_xref (ctx, nntp_data->group, b, hdr);
fc.ctx = ctx;
fc.base = first;
fc.last = last;
- fc.messages = mem_calloc (last - first + 1, sizeof (unsigned short));
+ fc.messages = p_new(unsigned short, last - first + 1);
#if WANT_LISTGROUP_COMMAND
if (nntp_data->nserv->hasLISTGROUP) {
snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group);
#ifdef DEBUG
nntp_error ("nntp_fetch_headers()", buf);
#endif
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
return -1;
}
}
}
num = last - first + 1;
if (num <= 0) {
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
return 0;
}
#ifdef DEBUG
nntp_error ("nntp_fetch_headers()", buf);
#endif
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
return -1;
}
/* fetched OK */
else
mutt_free_header (&h); /* skip it */
if (ret == -1) {
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
return -1;
}
if (current > nntp_data->lastLoaded)
nntp_data->lastLoaded = current;
}
- mem_free (&fc.messages);
+ p_delete(&fc.messages);
nntp_data->lastLoaded = last;
mutt_clear_error ();
return 0;
/* create NNTP-specific state struct if nof found in list */
if ((nntp_data = (NNTP_DATA *) hash_find (serv->newsgroups, buf)) == NULL) {
- nntp_data = mem_calloc (1, sizeof (NNTP_DATA) + str_len (buf) + 1);
+ nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(buf) + 1);
nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
strcpy (nntp_data->group, buf);
hash_insert (serv->newsgroups, nntp_data->group, nntp_data, 0);
/* clear the previous entry */
unlink (cache->path);
- mem_free (&cache->path);
+ p_delete(&cache->path);
cache->index = ctx->hdrs[msgno]->index;
mutt_mktemp (path);
cache->path = str_dup (path);
if (!(msg->fp = safe_fopen (path, "w+"))) {
- mem_free (&cache->path);
+ p_delete(&cache->path);
return -1;
}
if (ret) {
fclose (msg->fp);
unlink (path);
- mem_free (&cache->path);
+ p_delete(&cache->path);
return -1;
}
for (i = 0; i < NNTP_CACHE_LEN; i++) {
if (data->acache[i].path) {
unlink (data->acache[i].path);
- mem_free (&data->acache[i].path);
+ p_delete(&data->acache[i].path);
}
}
}
void nntp_delete_data (void *p)
{
- NNTP_DATA *data = (NNTP_DATA *) p;
+ NNTP_DATA *data = (NNTP_DATA *)p;
if (!p)
return;
- mem_free (&data->entries);
- mem_free (&data->desc);
- mem_free (&data->cache);
+ p_delete(&data->entries);
+ p_delete(&data->desc);
+ p_delete(&data->cache);
nntp_free_acache (data);
- mem_free (p);
+ p_delete(&data);
}
int nntp_sync_mailbox (CONTEXT * ctx, int unused1, int* unused2)
/* active was renumbered? */
if (last < nntp_data->lastLoaded) {
if (!nntp_data->max) {
- nntp_data->entries = mem_calloc (5, sizeof (NEWSRC_ENTRY));
+ nntp_data->entries = p_new(NEWSRC_ENTRY, 5);
nntp_data->max = 5;
}
nntp_data->lastCached = 0;
return 0;
if ((nntp_data = (NNTP_DATA *) hash_find (s->newsgroups, group)) == NULL) {
n++;
- nntp_data = mem_calloc (1, sizeof (NNTP_DATA) + str_len (group) + 1);
+ nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
strcpy (nntp_data->group, group);
nntp_data->nserv = s;
else
nntp_data->allowed = 0;
if (nntp_data->desc)
- mem_free (&nntp_data->desc);
+ p_delete(&nntp_data->desc);
if (*desc)
nntp_data->desc = str_dup (desc);
if (nntp_data->rc || nntp_data->lastCached)
return 0;
}
else {
- mem_free (&serv->cache);
+ p_delete(&serv->cache);
return -1;
}
}
if (cc->ctx->hdrs[i]->article_num == n)
return 0;
if (cc->num >= cc->max)
- mem_realloc (&cc->child, sizeof (unsigned int) * (cc->max += 25));
+ p_realloc(&cc->child, cc->max += 25);
cc->child[cc->num++] = n;
return 0;
cc.ctx = ctx;
cc.num = 0;
cc.max = 25;
- cc.child = mem_malloc (sizeof (unsigned int) * 25);
+ cc.child = p_new(unsigned int, 25);
if (mutt_nntp_fetch (nntp_data, buf, NULL, NULL, check_children, &cc, 0)) {
- mem_free (&cc.child);
+ p_delete(&cc.child);
return -1;
}
/* dont try to read the xover cache. check_children() already
}
if (tmp)
set_option (OPTNEWSCACHE);
- mem_free (&cc.child);
+ p_delete(&cc.child);
return ret;
}