projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reindent and optimizations in BUFFER* struct.
[apps/madmutt.git]
/
edit.c
diff --git
a/edit.c
b/edit.c
index
f5f93ac
..
47f4480
100644
(file)
--- a/
edit.c
+++ b/
edit.c
@@
-14,15
+14,15
@@
#endif
#include <lib-lib/mem.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "lib/str.h"
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
@@
-66,7
+66,7
@@
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
tmp[sizeof (tmp) - 1] = 0;
if (prefix) {
strfcpy (tmp, NONULL (Prefix), sizeof (tmp));
tmp[sizeof (tmp) - 1] = 0;
if (prefix) {
strfcpy (tmp, NONULL (Prefix), sizeof (tmp));
- tmplen =
str_len
(tmp);
+ tmplen =
m_strlen
(tmp);
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
}
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
}
@@
-75,10
+75,10
@@
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
while (bytes > 0) {
if (fgets (p, tmplen - 1, f) == NULL)
break;
while (bytes > 0) {
if (fgets (p, tmplen - 1, f) == NULL)
break;
- bytes -=
str_len
(p);
+ bytes -=
m_strlen
(p);
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
- buf[(*buflen)++] =
str_dup
(tmp);
+ buf[(*buflen)++] =
m_strdup
(tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
p_realloc(&buf, ++*bufmax);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
p_realloc(&buf, ++*bufmax);
@@
-158,7
+158,7
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
- buf[(*buflen)++] =
str_dup
(tmp);
+ buf[(*buflen)++] =
m_strdup
(tmp);
bytes = Context->hdrs[n]->content->length;
if (inc_hdrs) {
bytes = Context->hdrs[n]->content->length;
if (inc_hdrs) {
@@
-172,7
+172,7
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
if (*bufmax == *buflen)
p_realloc(&buf, *bufmax += 25);
- buf[(*buflen)++] =
str_dup
("\n");
+ buf[(*buflen)++] =
m_strdup
("\n");
}
else
printw (_("%d: invalid message number.\n"), n);
}
else
printw (_("%d: invalid message number.\n"), n);
@@
-319,7
+319,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
if (EscChar && tmp[0] == EscChar[0] && tmp[1] != EscChar[0]) {
/* remove trailing whitespace from the line */
if (EscChar && tmp[0] == EscChar[0] && tmp[1] != EscChar[0]) {
/* remove trailing whitespace from the line */
- p = tmp +
str_len
(tmp) - 1;
+ p = tmp +
m_strlen
(tmp) - 1;
while (p >= tmp && ISSPACE (*p))
*p-- = 0;
while (p >= tmp && ISSPACE (*p))
*p-- = 0;
@@
-348,9
+348,9
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
if (Context) {
if (!*p && cur) {
/* include the current message */
if (Context) {
if (!*p && cur) {
/* include the current message */
- p = tmp +
str_len
(tmp) + 1;
- snprintf (tmp +
str_len
(tmp),
- sizeof (tmp) -
str_len
(tmp), " %d",
+ p = tmp +
m_strlen
(tmp) + 1;
+ snprintf (tmp +
m_strlen
(tmp),
+ sizeof (tmp) -
m_strlen
(tmp), " %d",
cur->msgno + 1);
}
buf = be_include_messages (p, buf, &bufmax, &buflen,
cur->msgno + 1);
}
buf = be_include_messages (p, buf, &bufmax, &buflen,
@@
-392,7
+392,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
if (buflen) {
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
if (buflen) {
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
- tmp[
str_len
(tmp) - 1] = 0;
+ tmp[
m_strlen
(tmp) - 1] = 0;
p_delete(&buf[buflen]);
buf[buflen] = NULL;
continue;
p_delete(&buf[buflen]);
buf[buflen] = NULL;
continue;
@@
-442,7
+442,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
str_cat (tmp, sizeof (tmp), "\n");
if (buflen == bufmax)
p_realloc(&buf, bufmax += 25);
str_cat (tmp, sizeof (tmp), "\n");
if (buflen == bufmax)
p_realloc(&buf, bufmax += 25);
- buf[buflen++] =
str_dup
(tmp[1] == '~' ? tmp + 1 : tmp);
+ buf[buflen++] =
m_strdup
(tmp[1] == '~' ? tmp + 1 : tmp);
}
tmp[0] = 0;
}
tmp[0] = 0;