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]
/
commands.c
diff --git
a/commands.c
b/commands.c
index
fb62f07
..
20ed011
100644
(file)
--- a/
commands.c
+++ b/
commands.c
@@
-92,7
+92,7
@@
int mutt_display_message (HEADER * cur)
}
}
}
}
- if (!Pager ||
mutt_str
cmp (Pager, "builtin") == 0)
+ if (!Pager ||
str_
cmp (Pager, "builtin") == 0)
builtin = 1;
else {
mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
builtin = 1;
else {
mutt_make_string (buf, sizeof (buf), NONULL (PagerFmt), Context, cur);
@@
-262,7
+262,7
@@
void ci_bounce_message (HEADER * h, int *redraw)
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
if (mutt_addrlist_to_idna (adr, &err) < 0) {
mutt_error (_("Bad IDN: '%s'"), err);
-
FREE
(&err);
+
mem_free
(&err);
rfc822_free_address (&adr);
return;
}
rfc822_free_address (&adr);
return;
}
@@
-279,10
+279,10
@@
void ci_bounce_message (HEADER * h, int *redraw)
mutt_format_string (prompt, sizeof (prompt),
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
mutt_format_string (prompt, sizeof (prompt),
0, COLS - extra_space, 0, 0,
prompt, sizeof (prompt), 0);
- s
afe_str
cat (prompt, sizeof (prompt), "...?");
+ s
tr_
cat (prompt, sizeof (prompt), "...?");
}
else
}
else
- s
afe_str
cat (prompt, sizeof (prompt), "?");
+ s
tr_
cat (prompt, sizeof (prompt), "?");
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
rfc822_free_address (&adr);
if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
rfc822_free_address (&adr);
@@
-570,7
+570,7
@@
void mutt_enter_command (void)
err.dsize = sizeof (errbuf);
memset (&token, 0, sizeof (token));
r = mutt_parse_rc_line (buffer, &token, &err);
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()
if (errbuf[0]) {
/* since errbuf could potentially contain printf() sequences in it,
we must call mutt_error() in this fashion so that vsprintf()
@@
-738,7
+738,7
@@
int mutt_save_message (HEADER * h, int delete,
/* This is an undocumented feature of ELM pointed out to me by Felix von
* Leitner <leitner@prz.fu-berlin.de>
*/
/* This is an undocumented feature of ELM pointed out to me by Felix von
* Leitner <leitner@prz.fu-berlin.de>
*/
- if (
mutt_str
cmp (buf, ".") == 0)
+ if (
str_
cmp (buf, ".") == 0)
strfcpy (buf, LastSaveFolder, sizeof (buf));
else
strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));
strfcpy (buf, LastSaveFolder, sizeof (buf));
else
strfcpy (LastSaveFolder, buf, sizeof (LastSaveFolder));
@@
-869,7
+869,7
@@
int mutt_update_list_file (char *filename, char *section, char *key,
while (*c && *c != '\n')
c++;
c[0] = 0; /* strip EOL */
while (*c && *c != '\n')
c++;
c[0] = 0; /* strip EOL */
- if (!strncmp (buf, "#: ", 3) && !s
afe_str
casecmp (buf + 3, section))
+ if (!strncmp (buf, "#: ", 3) && !s
tr_
casecmp (buf + 3, section))
done++;
}
if (r != EOF && !done) {
done++;
}
if (r != EOF && !done) {
@@
-897,8
+897,8
@@
int mutt_update_list_file (char *filename, char *section, char *key,
done++;
break;
}
done++;
break;
}
- else if (key && !strncmp (buf, key,
mutt_str
len (key)) &&
- (!*key || buf[
mutt_str
len (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'))
c = buf;
ext = 0;
while (*c && (*c != '\r') && (*c != '\n'))
@@
-967,7
+967,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
size_t l;
for (p = b->parameter; p; p = p->next) {
size_t l;
for (p = b->parameter; p; p = p->next) {
- l =
mutt_str
len (buf);
+ l =
str_
len (buf);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
@@
-980,7
+980,7
@@
void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
/* clean up previous junk */
mutt_free_parameter (&b->parameter);
-
FREE
(&b->subtype);
+
mem_free
(&b->subtype);
mutt_parse_content_type (buf, b);
mutt_parse_content_type (buf, b);