projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix regression, propably due to some changes in the string API
[apps/madmutt.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
c3800df
..
13f3908
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"
@@
-377,7
+376,7
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* not much point in classifying quotes... */
if (*QuoteList == NULL) {
/* not much point in classifying quotes... */
if (*QuoteList == NULL) {
- class =
(struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t)
);
+ class =
p_new(struct q_class_t, 1
);
class->color = ColorQuote[0];
*QuoteList = class;
}
class->color = ColorQuote[0];
*QuoteList = class;
}
@@
-398,10
+397,8
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* found shorter prefix */
if (tmp == NULL) {
/* add a node above q_list */
/* found shorter prefix */
if (tmp == NULL) {
/* add a node above q_list */
- tmp =
- (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) mem_calloc (1, length + 1);
- strncpy (tmp->prefix, qptr, length);
+ tmp = p_new(struct q_class_t, 1);
+ tmp->prefix = p_dupstr(qptr, length);
tmp->length = length;
/* replace q_list by tmp in the top level list */
tmp->length = length;
/* replace q_list by tmp in the top level list */
@@
-501,11
+498,8
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* found shorter common prefix */
if (tmp == NULL) {
/* add a node above q_list */
/* found shorter common prefix */
if (tmp == NULL) {
/* add a node above q_list */
- tmp = (struct q_class_t *) mem_calloc (1,
- sizeof (struct
- q_class_t));
- tmp->prefix = (char *) mem_calloc (1, length + 1);
- strncpy (tmp->prefix, qptr, length);
+ tmp = p_new(struct q_class_t, 1);
+ tmp->prefix = p_dupstr(qptr, length);
tmp->length = length;
/* replace q_list by tmp */
tmp->length = length;
/* replace q_list by tmp */
@@
-598,10
+592,8
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
/* still not found so far: add it as a sibling to the current node */
if (class == NULL) {
/* still not found so far: add it as a sibling to the current node */
if (class == NULL) {
- tmp =
- (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
- tmp->prefix = (char *) mem_calloc (1, length + 1);
- strncpy (tmp->prefix, qptr, length);
+ tmp = p_new(struct q_class_t, 1);
+ tmp->prefix = p_dupstr(qptr, length);
tmp->length = length;
if (ptr->down) {
tmp->length = length;
if (ptr->down) {
@@
-632,9
+624,8
@@
static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
if (class == NULL) {
/* not found so far: add it as a top level class */
if (class == NULL) {
/* not found so far: add it as a top level class */
- class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
- class->prefix = (char *) mem_calloc (1, length + 1);
- strncpy (class->prefix, qptr, length);
+ class = p_new(struct q_class_t, 1);
+ class->prefix = p_dupstr(qptr, length);
class->length = length;
new_class_color (class, q_level);
class->length = length;
new_class_color (class, q_level);
@@
-696,8
+687,8
@@
resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
else if (check_attachment_marker ((char *) raw) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
#endif
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;
@@
-708,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;
}
@@
-772,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;
@@
-898,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)
@@
-992,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 */
@@
-1155,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);
@@
-1232,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;
@@
-1474,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);
@@
-1756,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));
}
@@
-2238,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));
}