projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more updates in the build system, gettext related.
[apps/madmutt.git]
/
edit.c
diff --git
a/edit.c
b/edit.c
index
893b495
..
f5f93ac
100644
(file)
--- a/
edit.c
+++ b/
edit.c
@@
-13,14
+13,15
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "ascii.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "mutt.h"
#include "ascii.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <stdio.h>
#include "lib/str.h"
#include <stdio.h>
@@
-76,11
+77,11
@@
static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
break;
bytes -= str_len (p);
if (*bufmax == *buflen)
break;
bytes -= str_len (p);
if (*bufmax == *buflen)
-
mem_realloc (&buf, sizeof (char *) * (*bufmax += 25)
);
+
p_realloc(&buf, *bufmax += 25
);
buf[(*buflen)++] = str_dup (tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
buf[(*buflen)++] = str_dup (tmp);
}
if (buf && *bufmax == *buflen) { /* Do not smash memory past buf */
-
mem_realloc (&buf, sizeof (char *) * (++*bufmax)
);
+
p_realloc(&buf, ++*bufmax
);
}
if (buf)
buf[*buflen] = NULL;
}
if (buf)
buf[*buflen] = NULL;
@@
-132,9
+133,9
@@
static int be_barf_file (const char *path, char **buf, int buflen)
static void be_free_memory (char **buf, int buflen)
{
while (buflen-- > 0)
static void be_free_memory (char **buf, int buflen)
{
while (buflen-- > 0)
-
mem_free
(&buf[buflen]);
+
p_delete
(&buf[buflen]);
if (buf)
if (buf)
-
mem_free
(&buf);
+
p_delete
(&buf);
}
static char **be_include_messages (char *msg, char **buf, int *bufmax,
}
static char **be_include_messages (char *msg, char **buf, int *bufmax,
@@
-156,7
+157,7
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
}
if (*bufmax == *buflen)
}
if (*bufmax == *buflen)
-
mem_realloc (&buf, sizeof (char *) * (*bufmax += 25)
);
+
p_realloc(&buf, *bufmax += 25
);
buf[(*buflen)++] = str_dup (tmp);
bytes = Context->hdrs[n]->content->length;
buf[(*buflen)++] = str_dup (tmp);
bytes = Context->hdrs[n]->content->length;
@@
-170,7
+171,7
@@
static char **be_include_messages (char *msg, char **buf, int *bufmax,
pfx);
if (*bufmax == *buflen)
pfx);
if (*bufmax == *buflen)
-
mem_realloc (&buf, sizeof (char *) * (*bufmax += 25)
);
+
p_realloc(&buf, *bufmax += 25
);
buf[(*buflen)++] = str_dup ("\n");
}
else
buf[(*buflen)++] = str_dup ("\n");
}
else
@@
-392,7
+393,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
tmp[str_len (tmp) - 1] = 0;
buflen--;
strfcpy (tmp, buf[buflen], sizeof (tmp));
tmp[str_len (tmp) - 1] = 0;
-
mem_free
(&buf[buflen]);
+
p_delete
(&buf[buflen]);
buf[buflen] = NULL;
continue;
}
buf[buflen] = NULL;
continue;
}
@@
-440,7
+441,7
@@
int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
else {
str_cat (tmp, sizeof (tmp), "\n");
if (buflen == bufmax)
else {
str_cat (tmp, sizeof (tmp), "\n");
if (buflen == bufmax)
-
mem_realloc (&buf, sizeof (char *) * (bufmax += 25)
);
+
p_realloc(&buf, bufmax += 25
);
buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp);
}
buf[buflen++] = str_dup (tmp[1] == '~' ? tmp + 1 : tmp);
}