}
}
- if (!Pager || mutt_strcmp (Pager, "builtin") == 0)
+ if (!Pager || str_cmp (Pager, "builtin") == 0)
builtin = 1;
else {
mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
- FREE (&err);
+ mem_free (&err);
rfc822_free_address (&adr);
return;
}
mutt_format_string (prompt, sizeof (prompt),
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
- safe_strcat (prompt, sizeof (prompt), "...?");
+ str_cat (prompt, sizeof (prompt), "...?");
}
else
- safe_strcat (prompt, sizeof (prompt), "?");
+ str_cat (prompt, sizeof (prompt), "?");
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
rfc822_free_address (&adr);
err.dsize = sizeof (errbuf);
memset (&token, 0, sizeof (token));
r = mutt_parse_rc_line (buffer, &token, &err);
- FREE (&token.data);
+ mem_free (&token.data);
if (errbuf[0]) {
/* since errbuf could potentially contain printf() sequences in it,
we must call mutt_error() in this fashion so that vsprintf()
/* This is an undocumented feature of ELM pointed out to me by Felix von
* Leitner <leitner@prz.fu-berlin.de>
*/
- if (mutt_strcmp (buf, ".") == 0)
+ if (str_cmp (buf, ".") == 0)
strfcpy (buf, LastSaveFolder, sizeof (buf));
else
strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));
while (*c && *c != '\n')
c++;
c[0] = 0; /* strip EOL */
- if (!strncmp (buf, "#: ", 3) && !safe_strcasecmp (buf + 3, section))
+ if (!strncmp (buf, "#: ", 3) && !str_casecmp (buf + 3, section))
done++;
}
if (r != EOF && !done) {
done++;
break;
}
- else if (key && !strncmp (buf, key, mutt_strlen (key)) &&
- (!*key || buf[mutt_strlen (key)] == ' ')) {
+ else if (key && !strncmp (buf, key, str_len (key)) &&
+ (!*key || buf[str_len (key)] == ' ')) {
c = buf;
ext = 0;
while (*c && (*c != '\r') && (*c != '\n'))
size_t l;
for (p = b->parameter; p; p = p->next) {
- l = mutt_strlen (buf);
+ l = str_len (buf);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
- FREE (&b->subtype);
+ mem_free (&b->subtype);
mutt_parse_content_type (buf, b);