#endif
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.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"
/* 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;
}
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 */
/* 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 != 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;
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)
/* 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 */
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;
/* 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) {
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);
}
}
}
- 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
- 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
- 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;
/* 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;
}
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;
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)
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 */
}
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));
+ p_clear(&(*lineInfo)[ch], 1);
(*lineInfo)[ch].type = -1;
(*lineInfo)[ch].search_cnt = -1;
(*lineInfo)[ch].syntax = p_new(struct syntax_t, 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;
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].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));
}
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));
}
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