projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xterm.c was absurd, no need to put trivial functions like this in a
[apps/madmutt.git]
/
pager.c
diff --git
a/pager.c
b/pager.c
index
31f139a
..
2a5cadf
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"
@@
-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;
@@
-1147,7
+1144,7
@@
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++) {
memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
(*lineInfo)[ch].type = -1;
for (ch = *last; ch < *max; ch++) {
memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
(*lineInfo)[ch].type = -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;
@@
-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));
}