projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
query.c
diff --git
a/query.c
b/query.c
index
35dbf2b
..
ea5fc89
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;
@@
-118,10
+118,10
@@
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);
}
}
}
}
}
}
@@
-185,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,
-
mutt_str
len (table[num].data->name), 0);
+
str_
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 ? '*' : ' ',
@@
-444,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 =
mutt_str
len (buf);
+ curpos =
str_
len (buf);
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
@@
-454,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 =
mutt_str
len (buf);
+ curpos =
str_
len (buf);
rfc822_free_address (&tmpa);
}
}
rfc822_free_address (&tmpa);
}
}