projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit str_cmp enters m_strcmp
[apps/madmutt.git]
/
help.c
diff --git
a/help.c
b/help.c
index
2f13577
..
72d0610
100644
(file)
--- a/
help.c
+++ b/
help.c
@@
-14,7
+14,7
@@
#endif
#include <lib-lib/macros.h>
#endif
#include <lib-lib/macros.h>
-#include
"lib/str.h"
+#include
<lib-lib/str.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt.h"
#include "mutt_curses.h"
@@
-72,7
+72,7
@@
char *mutt_compile_help (char *buf, size_t buflen, int menu,
buflen -= 2;
}
mutt_make_help (pbuf, buflen, _(items[i].name), menu, items[i].value);
buflen -= 2;
}
mutt_make_help (pbuf, buflen, _(items[i].name), menu, items[i].value);
- len =
str_len
(pbuf);
+ len =
m_strlen
(pbuf);
pbuf += len;
buflen -= len;
}
pbuf += len;
buflen -= len;
}
@@
-85,11
+85,11
@@
static int print_macro (FILE * f, int maxwidth, const char **macro)
wchar_t wc;
int w;
size_t k;
wchar_t wc;
int w;
size_t k;
- size_t len =
str_len
(*macro);
+ size_t len =
m_strlen
(*macro);
mbstate_t mbstate1, mbstate2;
mbstate_t mbstate1, mbstate2;
-
memset (&mbstate1, 0, sizeof (mbstate1)
);
-
memset (&mbstate2, 0, sizeof (mbstate2)
);
+
p_clear(&mbstate1, 1
);
+
p_clear(&mbstate2, 1
);
for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1));
*macro += k, len -= k) {
if (k == (size_t) (-1) || k == (size_t) (-2)) {
for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1));
*macro += k, len -= k) {
if (k == (size_t) (-1) || k == (size_t) (-2)) {
@@
-168,18
+168,18
@@
static void format_line (FILE * f, int ismacro,
else {
col_a = COLS > 83 ? (COLS - 32) >> 2 : 12;
col_b = COLS > 49 ? (COLS - 10) >> 1 : 19;
else {
col_a = COLS > 83 ? (COLS - 32) >> 2 : 12;
col_b = COLS > 49 ? (COLS - 10) >> 1 : 19;
- col = pad (f,
str_len
(t1), col_a);
+ col = pad (f,
m_strlen
(t1), col_a);
}
if (ismacro > 0) {
}
if (ismacro > 0) {
- if (!
str_cmp
(Pager, "builtin"))
+ if (!
m_strcmp
(Pager, "builtin"))
fputs ("_\010", f);
fputs ("M ", f);
col += 2;
if (!split) {
col += print_macro (f, col_b - col - 4, &t2);
fputs ("_\010", f);
fputs ("M ", f);
col += 2;
if (!split) {
col += print_macro (f, col_b - col - 4, &t2);
- if (
str_len
(t2) > col_b - col)
+ if (
m_strlen
(t2) > col_b - col)
t2 = "...";
}
}
t2 = "...";
}
}
@@
-202,7
+202,7
@@
static void format_line (FILE * f, int ismacro,
SKIPWS (t3);
/* FIXME: this is completely wrong */
SKIPWS (t3);
/* FIXME: this is completely wrong */
- if ((n =
str_len
(t3)) > COLS - col) {
+ if ((n =
m_strlen
(t3)) > COLS - col) {
n = COLS - col;
for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--);
if (col_a)
n = COLS - col;
for (col_a = n; col_a > 0 && t3[col_a] != ' '; col_a--);
if (col_a)
@@
-213,7
+213,7
@@
static void format_line (FILE * f, int ismacro,
print_macro (f, n, &t3);
if (*t3) {
print_macro (f, n, &t3);
if (*t3) {
- if (
str_cmp
(Pager, "builtin")) {
+ if (
m_strcmp
(Pager, "builtin")) {
fputc ('\n', f);
n = 0;
}
fputc ('\n', f);
n = 0;
}