projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more nonnull attributes.
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
9afd5cd
..
590b53a
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-335,8
+335,8
@@
void mutt_FormatString (char *dest, /* output buffer */
unsigned long data, /* callback data */
format_flag flags)
{ /* callback flags */
unsigned long data, /* callback data */
format_flag flags)
{ /* callback flags */
- char prefix[S
HORT_S
TRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
- char ifstring[S
HORT_STRING], elsestring[SHORT_
STRING];
+ char prefix[STRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
+ char ifstring[S
TRING], elsestring[
STRING];
ssize_t wlen, wid, count, col, len;
prefix[0] = '\0';
ssize_t wlen, wid, count, col, len;
prefix[0] = '\0';
@@
-750,7
+750,7
@@
int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
if (!*tok->dptr)
return -1; /* premature end of token */
mutt_buffer_addch(dest,
if (!*tok->dptr)
return -1; /* premature end of token */
mutt_buffer_addch(dest,
- (
ascii_toupper(
*tok->dptr) - 'A' + 1) & 0x7f);
+ (
toupper((unsigned char)
*tok->dptr) - 'A' + 1) & 0x7f);
tok->dptr++;
break;
case 'r':
tok->dptr++;
break;
case 'r':
@@
-792,7
+792,7
@@
int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
mutt_buffer_addch(dest, '\033');
} else
if (isalpha((unsigned char)ch)) {
mutt_buffer_addch(dest, '\033');
} else
if (isalpha((unsigned char)ch)) {
- mutt_buffer_addch(dest,
ascii_toupper(
ch) - 'A' + 1);
+ mutt_buffer_addch(dest,
toupper((unsigned char)
ch) - 'A' + 1);
} else {
mutt_buffer_addch(dest, '^');
mutt_buffer_addch(dest, ch);
} else {
mutt_buffer_addch(dest, '^');
mutt_buffer_addch(dest, ch);