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]
/
nntp
/
newsrc.c
diff --git
a/nntp/newsrc.c
b/nntp/newsrc.c
index
3f707ab
..
8f0e514
100644
(file)
--- a/
nntp/newsrc.c
+++ b/
nntp/newsrc.c
@@
-25,7
+25,6
@@
#include "rfc1524.h"
#include "rfc2047.h"
#include "rfc1524.h"
#include "rfc2047.h"
-#include "lib/mem.h"
#include "lib/str.h"
#include "lib/intl.h"
#include "lib/debug.h"
#include "lib/str.h"
#include "lib/intl.h"
#include "lib/debug.h"
@@
-44,7
+43,7
@@
void nntp_add_to_list (NNTP_SERVER * s, NNTP_DATA * d)
if (!s || !d)
return;
if (!s || !d)
return;
- l =
mem_calloc (1, sizeof (LIST)
);
+ l =
p_new(LIST, 1
);
if (s->list)
s->tail->next = l;
else
if (s->list)
s->tail->next = l;
else
@@
-76,8
+75,7
@@
static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
len = sizeof (group);
strfcpy (group, line, len);
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, group)) == NULL) {
len = sizeof (group);
strfcpy (group, line, len);
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, group)) == NULL) {
- data =
- (NNTP_DATA *) mem_calloc (1, sizeof (NNTP_DATA) + str_len (group) + 1);
+ data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
@@
-92,7
+90,7
@@
static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
p_delete(&data->entries);
data->rc = 1;
p_delete(&data->entries);
data->rc = 1;
- data->entries =
mem_calloc (x * 2, sizeof (NEWSRC_ENTRY)
);
+ data->entries =
p_new(NEWSRC_ENTRY, x * 2
);
data->max = x * 2;
if (*p == ':')
data->max = x * 2;
if (*p == ':')
@@
-229,9
+227,7
@@
static int nntp_parse_cacheindex (NNTP_SERVER * news)
}
else if (news->newsgroups) {
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, buf)) == NULL) {
}
else if (news->newsgroups) {
if ((data = (NNTP_DATA *) hash_find (news->newsgroups, buf)) == NULL) {
- data =
- (NNTP_DATA *) mem_calloc (1,
- sizeof (NNTP_DATA) + str_len (buf) + 1);
+ data = xmalloc(sizeof(NNTP_DATA) + str_len(buf) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, buf);
data->nserv = news;
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, buf);
data->nserv = news;
@@
-348,7
+344,7
@@
NNTP_SERVER *mutt_select_newsserver (char *server)
return NULL;
}
return NULL;
}
- buf = p =
mem_calloc (str_len (server) + 10, sizeof (char)
);
+ buf = p =
p_new(char, str_len (server) + 10
);
if (url_check_scheme (server) == U_UNKNOWN) {
strcpy (buf, "nntp://");
p = strchr (buf, '\0');
if (url_check_scheme (server) == U_UNKNOWN) {
strcpy (buf, "nntp://");
p = strchr (buf, '\0');
@@
-398,7
+394,7
@@
NNTP_SERVER *mutt_select_newsserver (char *server)
}
/* New newsserver */
}
/* New newsserver */
- serv =
mem_calloc (1, sizeof (NNTP_SERVER)
);
+ serv =
p_new(NNTP_SERVER, 1
);
serv->conn = conn;
serv->newsrc = str_dup (file);
serv->newsgroups = hash_create (1009);
serv->conn = conn;
serv->newsrc = str_dup (file);
serv->newsgroups = hash_create (1009);
@@
-513,7
+509,7
@@
static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
len += *buflen;
*buflen *= 2;
line = *buf;
len += *buflen;
*buflen *= 2;
line = *buf;
-
mem_realloc
(buf, *buflen);
+
p_realloc
(buf, *buflen);
line = *buf + (*pline - line);
}
strcpy (line, data->group);
line = *buf + (*pline - line);
}
strcpy (line, data->group);
@@
-529,7
+525,7
@@
static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
*buflen *= 2;
*pline = line;
line = *buf;
*buflen *= 2;
*pline = line;
line = *buf;
-
mem_realloc
(buf, *buflen);
+
p_realloc
(buf, *buflen);
line = *buf + (*pline - line);
}
if (x) {
line = *buf + (*pline - line);
}
if (x) {
@@
-577,7
+573,7
@@
void newsrc_gen_entries (CONTEXT * ctx)
}
if (!data->max) {
}
if (!data->max) {
- data->entries =
mem_calloc (5, sizeof (NEWSRC_ENTRY)
);
+ data->entries =
p_new(NEWSRC_ENTRY, 5
);
data->max = 5;
}
data->max = 5;
}
@@
-599,7
+595,7
@@
void newsrc_gen_entries (CONTEXT * ctx)
!ctx->hdrs[x]->read) {
if (data->num >= data->max) {
data->max = data->max * 2;
!ctx->hdrs[x]->read) {
if (data->num >= data->max) {
data->max = data->max * 2;
-
mem_realloc (&data->entries, data->max * sizeof (NEWSRC_ENTRY)
);
+
p_realloc(&data->entries, data->max
);
}
data->entries[data->num].first = first;
data->entries[data->num].last = last - 1;
}
data->entries[data->num].first = first;
data->entries[data->num].last = last - 1;
@@
-619,7
+615,7
@@
void newsrc_gen_entries (CONTEXT * ctx)
if (series && first <= data->lastLoaded) {
if (data->num >= data->max) {
data->max = data->max * 2;
if (series && first <= data->lastLoaded) {
if (data->num >= data->max) {
data->max = data->max * 2;
-
mem_realloc (&data->entries, data->max * sizeof (NEWSRC_ENTRY)
);
+
p_realloc(&data->entries, data->max
);
}
data->entries[data->num].first = first;
data->entries[data->num].last = data->lastLoaded;
}
data->entries[data->num].first = first;
data->entries[data->num].last = data->lastLoaded;
@@
-756,7
+752,7
@@
int mutt_newsrc_update (NNTP_SERVER * news)
if (!news)
return -1;
llen = len = 10 * LONG_STRING;
if (!news)
return -1;
llen = len = 10 * LONG_STRING;
- line = buf =
mem_calloc (1
, len);
+ line = buf =
p_new(char
, len);
/* we will generate full newsrc here */
for (tmp = news->list; tmp; tmp = tmp->next) {
data = (NNTP_DATA *) tmp->data;
/* we will generate full newsrc here */
for (tmp = news->list; tmp; tmp = tmp->next) {
data = (NNTP_DATA *) tmp->data;
@@
-996,8
+992,7
@@
NNTP_DATA *mutt_newsgroup_subscribe (NNTP_SERVER * news, char *group)
if (!news || !news->newsgroups || !group || !*group)
return NULL;
if (!(data = (NNTP_DATA *) hash_find (news->newsgroups, group))) {
if (!news || !news->newsgroups || !group || !*group)
return NULL;
if (!(data = (NNTP_DATA *) hash_find (news->newsgroups, group))) {
- data =
- (NNTP_DATA *) mem_calloc (1, sizeof (NNTP_DATA) + str_len (group) + 1);
+ data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
data->group = (char *) data + sizeof (NNTP_DATA);
strcpy (data->group, group);
data->nserv = news;
@@
-1038,7
+1033,7
@@
NNTP_DATA *mutt_newsgroup_catchup (NNTP_SERVER * news, char *group)
!(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
return NULL;
if (!data->max) {
!(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
return NULL;
if (!data->max) {
- data->entries =
mem_calloc (5, sizeof (NEWSRC_ENTRY)
);
+ data->entries =
p_new(NEWSRC_ENTRY, 5
);
data->max = 5;
}
data->num = 1;
data->max = 5;
}
data->num = 1;
@@
-1062,7
+1057,7
@@
NNTP_DATA *mutt_newsgroup_uncatchup (NNTP_SERVER * news, char *group)
!(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
return NULL;
if (!data->max) {
!(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
return NULL;
if (!data->max) {
- data->entries =
mem_calloc (5, sizeof (NEWSRC_ENTRY)
);
+ data->entries =
p_new(NEWSRC_ENTRY, 5
);
data->max = 5;
}
data->num = 1;
data->max = 5;
}
data->num = 1;