projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use safer p_clear when possible.
[apps/madmutt.git]
/
query.c
diff --git
a/query.c
b/query.c
index
f7a7894
..
1e1937d
100644
(file)
--- a/
query.c
+++ b/
query.c
@@
-12,6
+12,7
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include <lib-lib/macros.h>
#include "mutt.h"
@@
-20,7
+21,6
@@
#include "mapping.h"
#include "sort.h"
#include "mapping.h"
#include "sort.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
#include "lib/debug.h"
#include <string.h>
@@
-63,7
+63,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 =
str_dup
(r->name);
+ tmp->personal =
m_strdup
(r->name);
mutt_addrlist_to_idna (tmp, NULL);
return tmp;
mutt_addrlist_to_idna (tmp, NULL);
return tmp;
@@
-119,10
+119,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 =
str_dup
(p);
+ cur->name =
m_strdup
(p);
p = strtok (NULL, "\t\n");
if (p) {
p = strtok (NULL, "\t\n");
if (p) {
- cur->other =
str_dup
(p);
+ cur->other =
m_strdup
(p);
}
}
}
}
}
}
@@
-186,7
+186,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,
-
str_len
(table[num].data->name), 0);
+
m_strlen
(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 ? '*' : ' ',
@@
-432,7
+432,7
@@
static void query_menu (char *buf, size_t buflen, QUERY * results, int retbuf)
int tagged = 0;
size_t curpos = 0;
int tagged = 0;
size_t curpos = 0;
-
memset (buf, 0
, buflen);
+
p_clear(buf
, buflen);
/* check for tagged entries */
for (i = 0; i < menu->max; i++) {
/* check for tagged entries */
for (i = 0; i < menu->max; i++) {
@@
-443,7
+443,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 =
str_len
(buf);
+ curpos =
m_strlen
(buf);
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
rfc822_free_address (&tmpa);
}
else if (curpos + 2 < buflen) {
@@
-453,7
+453,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 =
str_len
(buf);
+ curpos =
m_strlen
(buf);
rfc822_free_address (&tmpa);
}
}
rfc822_free_address (&tmpa);
}
}