projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andreas Krennmair:
[apps/madmutt.git]
/
query.c
diff --git
a/query.c
b/query.c
index
570ef07
..
df02f4a
100644
(file)
--- a/
query.c
+++ b/
query.c
@@
-62,7
+62,7
@@
static ADDRESS *result_to_addr (QUERY * r)
tmp = rfc822_cpy_adr (r->addr);
if (!tmp->next && !tmp->personal)
tmp = rfc822_cpy_adr (r->addr);
if (!tmp->next && !tmp->personal)
- tmp->personal = s
afe_str
dup (r->name);
+ tmp->personal = s
tr_
dup (r->name);
mutt_addrlist_to_idna (tmp, NULL);
return tmp;
mutt_addrlist_to_idna (tmp, NULL);
return tmp;
@@
-100,11
+100,11
@@
static QUERY *run_query (char *s, int quiet)
if (first == NULL) {
FirstColumn = 0;
SecondColumn = 0;
if (first == NULL) {
FirstColumn = 0;
SecondColumn = 0;
- first = (QUERY *)
safe
_calloc (1, sizeof (QUERY));
+ first = (QUERY *)
mem
_calloc (1, sizeof (QUERY));
cur = first;
}
else {
cur = first;
}
else {
- cur->next = (QUERY *)
safe
_calloc (1, sizeof (QUERY));
+ cur->next = (QUERY *)
mem
_calloc (1, sizeof (QUERY));
cur = cur->next;
}
cur = cur->next;
}
@@
-118,15
+118,15
@@
static QUERY *run_query (char *s, int quiet)
l = mutt_strwidth (p);
if (l > FirstColumn)
FirstColumn = l;
l = mutt_strwidth (p);
if (l > FirstColumn)
FirstColumn = l;
- cur->name = s
afe_str
dup (p);
+ cur->name = s
tr_
dup (p);
p = strtok (NULL, "\t\n");
if (p) {
p = strtok (NULL, "\t\n");
if (p) {
- cur->other = s
afe_str
dup (p);
+ cur->other = s
tr_
dup (p);
}
}
}
}
}
}
}
}
-
FREE
(&buf);
+
mem_free
(&buf);
fclose (fp);
if (mutt_wait_filter (thepid)) {
debug_print (1, ("Error: %s\n", msg));
fclose (fp);
if (mutt_wait_filter (thepid)) {
debug_print (1, ("Error: %s\n", msg));
@@
-156,11
+156,6
@@
static int query_search (MUTTMENU * m, regex_t * re, int n)
if (table[n].data->addr->mailbox &&
!regexec (re, table[n].data->addr->mailbox, 0, NULL, 0))
return 0;
if (table[n].data->addr->mailbox &&
!regexec (re, table[n].data->addr->mailbox, 0, NULL, 0))
return 0;
-#ifdef EXACT_ADDRESS
- if (table[n].data->addr->val &&
- !regexec (re, table[n].data->addr->val, 0, NULL, 0))
- return 0;
-#endif
}
return REG_NOMATCH;
}
return REG_NOMATCH;
@@
-190,7
+185,7
@@
static void query_entry (char *s, size_t slen, MUTTMENU * m, int num)
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
0, ' ', table[num].data->name,
mutt_format_string (buf2, sizeof (buf2),
FirstColumn + 2, FirstColumn + 2,
0, ' ', table[num].data->name,
- s
afe_str
len (table[num].data->name), 0);
+ s
tr_
len (table[num].data->name), 0);
snprintf (s, slen, " %c %3d %s %-*.*s %s",
table[num].tagged ? '*' : ' ',
snprintf (s, slen, " %c %3d %s %-*.*s %s",
table[num].tagged ? '*' : ' ',
@@
-293,7
+288,7
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
menu->max++;
menu->data = QueryTable =
menu->max++;
menu->data = QueryTable =
- (ENTRY *)
safe
_calloc (menu->max, sizeof (ENTRY));
+ (ENTRY *)
mem
_calloc (menu->max, sizeof (ENTRY));
for (i = 0, queryp = results; queryp; queryp = queryp->next, i++)
QueryTable[i].data = queryp;
for (i = 0, queryp = results; queryp; queryp = queryp->next, i++)
QueryTable[i].data = queryp;
@@
-315,14
+310,14
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
queryp = results;
while (queryp) {
rfc822_free_address (&queryp->addr);
queryp = results;
while (queryp) {
rfc822_free_address (&queryp->addr);
-
FREE
(&queryp->name);
-
FREE
(&queryp->other);
+
mem_free
(&queryp->name);
+
mem_free
(&queryp->other);
results = queryp->next;
results = queryp->next;
-
FREE
(&queryp);
+
mem_free
(&queryp);
queryp = results;
}
results = newresults;
queryp = results;
}
results = newresults;
-
FREE
(&QueryTable);
+
mem_free
(&QueryTable);
}
else {
/* append */
}
else {
/* append */
@@
-350,7
+345,7
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
if (op == OP_QUERY) {
menu->data = QueryTable =
if (op == OP_QUERY) {
menu->data = QueryTable =
- (ENTRY *)
safe
_calloc (menu->max, sizeof (ENTRY));
+ (ENTRY *)
mem
_calloc (menu->max, sizeof (ENTRY));
for (i = 0, queryp = results; queryp;
queryp = queryp->next, i++)
for (i = 0, queryp = results; queryp;
queryp = queryp->next, i++)
@@
-360,7
+355,7
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
int clear = 0;
/* append */
int clear = 0;
/* append */
-
safe
_realloc (&QueryTable, menu->max * sizeof (ENTRY));
+
mem
_realloc (&QueryTable, menu->max * sizeof (ENTRY));
menu->data = QueryTable;
menu->data = QueryTable;
@@
-449,7
+444,7
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
mutt_addrlist_to_local (tmpa);
tagged = 1;
rfc822_write_address (buf, buflen, tmpa, 0);
mutt_addrlist_to_local (tmpa);
tagged = 1;
rfc822_write_address (buf, buflen, tmpa, 0);
- curpos = s
afe_str
len (buf);
+ curpos = s
tr_
len (buf);
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
@@
-459,7
+454,7
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
strcat (buf, ", "); /* __STRCAT_CHECKED__ */
rfc822_write_address ((char *) buf + curpos + 1,
buflen - curpos - 1, tmpa, 0);
strcat (buf, ", "); /* __STRCAT_CHECKED__ */
rfc822_write_address ((char *) buf + curpos + 1,
buflen - curpos - 1, tmpa, 0);
- curpos = s
afe_str
len (buf);
+ curpos = s
tr_
len (buf);
rfc822_free_address (&tmpa);
}
}
rfc822_free_address (&tmpa);
}
}
@@
-478,13
+473,13
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
queryp = results;
while (queryp) {
rfc822_free_address (&queryp->addr);
queryp = results;
while (queryp) {
rfc822_free_address (&queryp->addr);
-
FREE
(&queryp->name);
-
FREE
(&queryp->other);
+
mem_free
(&queryp->name);
+
mem_free
(&queryp->other);
results = queryp->next;
results = queryp->next;
-
FREE
(&queryp);
+
mem_free
(&queryp);
queryp = results;
}
queryp = results;
}
-
FREE
(&QueryTable);
+
mem_free
(&QueryTable);
/* tell whoever called me to redraw the screen when I return */
set_option (OPTNEEDREDRAW);
/* tell whoever called me to redraw the screen when I return */
set_option (OPTNEEDREDRAW);