projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove yet anoter round of str_* functions, replaced with their inlineable
[apps/madmutt.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
31f139a
..
ad57de7
100644
(file)
--- a/
pager.c
+++ b/
pager.c
@@
-16,6
+16,8
@@
#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 "enter.h"
#include "mutt.h"
#include "enter.h"
@@
-39,9
+41,6
@@
#include "mutt_crypt.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/rx.h"
#include "lib/debug.h"
#include "lib/rx.h"
#include "lib/debug.h"
@@
-391,7
+390,7
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
if (length <= q_list->length) {
/* case 1: check the top level nodes */
if (length <= q_list->length) {
/* case 1: check the top level nodes */
- if (
str_ncmp
(qptr, q_list->prefix, length) == 0) {
+ if (
m_strncmp
(qptr, q_list->prefix, length) == 0) {
if (length == q_list->length)
return q_list; /* same prefix: return the current class */
if (length == q_list->length)
return q_list; /* same prefix: return the current class */
@@
-478,7
+477,7
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* tmp != NULL means we already found a shorter prefix at case 1 */
if (tmp == NULL
/* tmp != NULL means we already found a shorter prefix at case 1 */
if (tmp == NULL
- &&
str_ncmp
(qptr, q_list->prefix, q_list->length) == 0) {
+ &&
m_strncmp
(qptr, q_list->prefix, q_list->length) == 0) {
/* ok, it's a subclass somewhere on this branch */
ptr = q_list;
/* ok, it's a subclass somewhere on this branch */
ptr = q_list;
@@
-490,7
+489,7
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
while (q_list) {
if (length <= q_list->length) {
while (q_list) {
if (length <= q_list->length) {
- if (
str_ncmp
(tail_qptr, (q_list->prefix) + offset, tail_lng)
+ if (
m_strncmp
(tail_qptr, (q_list->prefix) + offset, tail_lng)
== 0) {
/* same prefix: return the current class */
if (length == q_list->length)
== 0) {
/* same prefix: return the current class */
if (length == q_list->length)
@@
-571,7
+570,7
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
else {
/* longer than the current prefix: try subclassing it */
if (tmp == NULL
else {
/* longer than the current prefix: try subclassing it */
if (tmp == NULL
- &&
str_ncmp
(tail_qptr, (q_list->prefix) + offset,
+ &&
m_strncmp
(tail_qptr, (q_list->prefix) + offset,
q_list->length - offset) == 0) {
/* still a subclass: go down one level */
ptr = q_list;
q_list->length - offset) == 0) {
/* still a subclass: go down one level */
ptr = q_list;
@@
-679,17
+678,17
@@
resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
}
}
}
}
}
}
- else if (
str_ncmp
("\033[0m", raw, 4) == 0) /* a little hack... */
+ else if (
m_strncmp
("\033[0m", raw, 4) == 0) /* a little hack... */
lineInfo[n].type = MT_COLOR_NORMAL;
#if 0
lineInfo[n].type = MT_COLOR_NORMAL;
#if 0
- else if (
str_ncmp
("[-- ", buf, 4) == 0)
+ else if (
m_strncmp
("[-- ", buf, 4) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
#else
else if (check_attachment_marker ((char *) raw) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
#endif
lineInfo[n].type = MT_COLOR_ATTACHMENT;
#else
else if (check_attachment_marker ((char *) raw) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
#endif
- else if (
str_cmp
("-- \n", buf) == 0
- ||
str_cmp
("-- \r\n", buf) == 0) {
+ else if (
m_strcmp
("-- \n", buf) == 0
+ ||
m_strcmp
("-- \r\n", buf) == 0) {
i = n + 1;
lineInfo[n].type = MT_COLOR_SIGNATURE;
i = n + 1;
lineInfo[n].type = MT_COLOR_SIGNATURE;
@@
-700,7
+699,7
@@
resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
/* oops... */
if (lineInfo[i].chunks) {
lineInfo[i].chunks = 0;
/* oops... */
if (lineInfo[i].chunks) {
lineInfo[i].chunks = 0;
-
mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t)
);
+
p_realloc(&(lineInfo[n].syntax), 1
);
}
lineInfo[i++].type = MT_COLOR_SIGNATURE;
}
}
lineInfo[i++].type = MT_COLOR_SIGNATURE;
}
@@
-764,9
+763,7
@@
resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
if (pmatch[0].rm_eo != pmatch[0].rm_so) {
if (!found) {
if (++(lineInfo[n].chunks) > 1)
if (pmatch[0].rm_eo != pmatch[0].rm_so) {
if (!found) {
if (++(lineInfo[n].chunks) > 1)
- mem_realloc (&(lineInfo[n].syntax),
- (lineInfo[n].chunks) *
- sizeof (struct syntax_t));
+ p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks);
}
i = lineInfo[n].chunks - 1;
pmatch[0].rm_so += offset;
}
i = lineInfo[n].chunks - 1;
pmatch[0].rm_so += offset;
@@
-890,7
+887,7
@@
static int trim_incomplete_mbyte(unsigned char *buf, size_t len) {
mbstate_t mbstate;
size_t k;
mbstate_t mbstate;
size_t k;
-
memset (&mbstate, 0, sizeof (mbstate)
);
+
p_clear(&mbstate, 1
);
for (; len > 0; buf += k, len -= k) {
k = mbrtowc (NULL, (char *) buf, len, &mbstate);
if (k == -2)
for (; len > 0; buf += k, len -= k) {
k = mbrtowc (NULL, (char *) buf, len, &mbstate);
if (k == -2)
@@
-984,7
+981,7
@@
static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
wrap_cols = COLS;
/* FIXME: this should come from lineInfo */
wrap_cols = COLS;
/* FIXME: this should come from lineInfo */
-
memset (&mbstate, 0, sizeof (mbstate)
);
+
p_clear(&mbstate, 1
);
for (ch = 0, vch = 0; ch < cnt; ch += k, vch += k) {
/* Handle ANSI sequences */
for (ch = 0, vch = 0; ch < cnt; ch += k, vch += k) {
/* Handle ANSI sequences */
@@
-1147,9
+1144,9
@@
display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
}
if (*last == *max) {
}
if (*last == *max) {
-
mem_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES)
);
+
p_realloc(lineInfo, *max += LINES
);
for (ch = *last; ch < *max; ch++) {
for (ch = *last; ch < *max; ch++) {
-
memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t)
);
+
p_clear(&(*lineInfo)[ch], 1
);
(*lineInfo)[ch].type = -1;
(*lineInfo)[ch].search_cnt = -1;
(*lineInfo)[ch].syntax = p_new(struct syntax_t, 1);
(*lineInfo)[ch].type = -1;
(*lineInfo)[ch].search_cnt = -1;
(*lineInfo)[ch].syntax = p_new(struct syntax_t, 1);
@@
-1224,8
+1221,7
@@
display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
(SearchRE, (char *) fmt + offset, 1, pmatch,
(offset ? REG_NOTBOL : 0)) == 0) {
if (++((*lineInfo)[n].search_cnt) > 1)
(SearchRE, (char *) fmt + offset, 1, pmatch,
(offset ? REG_NOTBOL : 0)) == 0) {
if (++((*lineInfo)[n].search_cnt) > 1)
- mem_realloc (&((*lineInfo)[n].search),
- ((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
+ p_realloc(&(*lineInfo)[n].search, (*lineInfo)[n].search_cnt);
else
(*lineInfo)[n].search = p_new(struct syntax_t, 1);
pmatch[0].rm_so += offset;
else
(*lineInfo)[n].search = p_new(struct syntax_t, 1);
pmatch[0].rm_so += offset;
@@
-1466,7
+1462,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lineInfo = p_new(struct line_t, maxLine = LINES);
for (i = 0; i < maxLine; i++) {
lineInfo = p_new(struct line_t, maxLine = LINES);
for (i = 0; i < maxLine; i++) {
-
memset (&lineInfo[i], 0, sizeof (struct line_t)
);
+
p_clear(&lineInfo[i], 1
);
lineInfo[i].type = -1;
lineInfo[i].search_cnt = -1;
lineInfo[i].syntax = p_new(struct syntax_t, 1);
lineInfo[i].type = -1;
lineInfo[i].search_cnt = -1;
lineInfo[i].syntax = p_new(struct syntax_t, 1);
@@
-1748,7
+1744,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
-
mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t)
);
+
p_realloc(&lineInfo[i].syntax, 1
);
if (SearchCompiled && lineInfo[i].search)
p_delete(&(lineInfo[i].search));
}
if (SearchCompiled && lineInfo[i].search)
p_delete(&(lineInfo[i].search));
}
@@
-2230,7
+2226,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
lineInfo[i].search_cnt = -1;
lineInfo[i].quote = NULL;
-
mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t)
);
+
p_realloc(&(lineInfo[i].syntax), 1
);
if (SearchCompiled && lineInfo[i].search)
p_delete(&(lineInfo[i].search));
}
if (SearchCompiled && lineInfo[i].search)
p_delete(&(lineInfo[i].search));
}
@@
-2346,7
+2342,7
@@
mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
else
followup_to = extra->hdr->env->followup_to;
else
followup_to = extra->hdr->env->followup_to;
- if (!followup_to ||
str_casecmp
(followup_to, "poster") ||
+ if (!followup_to ||
m_strcasecmp
(followup_to, "poster") ||
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) != M_YES) {
if (extra->ctx && extra->ctx->magic == M_NNTP
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) != M_YES) {
if (extra->ctx && extra->ctx->magic == M_NNTP