* It's licensed under the GNU General Public License,
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
+
+#include <lib-lib/lib-lib.h>
#ifdef USE_HCACHE
#define MUTTNG_HCACHE_ID "0x004"
-# ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-# else
-# ifdef HAVE_STDINT_H
-# include <stdint.h>
-# endif
-# endif
-
#if defined(HAVE_QDBM)
#include <depot.h>
#include <cabin.h>
#include <db.h>
#endif
-#include <errno.h>
-#include <fcntl.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <lib-lib/mem.h>
#include <lib-hash/hash.h>
-
#include <lib-mime/mime.h>
#include "charset.h"
unsigned long uid_validity;
} validate;
-static void *lazy_malloc (ssize_t siz)
-{
- if (0 < siz && siz < 4096) {
- siz = 4096;
- }
+#define UPPER4K(i) ((i & ~(4096 - 1)) + 4096)
- return xmalloc(siz);
+static unsigned char *lazy_malloc(ssize_t siz)
+{
+ return p_new(unsigned char, UPPER4K(siz));
}
-static void lazy_realloc(void *ptr, ssize_t siz)
+static void lazy_realloc(unsigned char **p, ssize_t siz)
{
- char **p = ptr;
-
- if (p != NULL && 0 < siz && siz < 4096) {
- return;
- }
-
- p_realloc(&p, siz);
+ p_realloc(p, UPPER4K(siz));
}
static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
*l = NULL;
}
-static unsigned char *dump_parameter (PARAMETER * p, unsigned char *d,
+static unsigned char *dump_parameter (parameter_t * p, unsigned char *d,
int *off)
{
unsigned int counter = 0;
}
static void
-restore_parameter (PARAMETER ** p, const unsigned char *d, int *off)
+restore_parameter (parameter_t ** p, const unsigned char *d, int *off)
{
unsigned int counter;
restore_int (&counter, d, off);
while (counter) {
- *p = p_new(PARAMETER, 1);
+ *p = parameter_new();
restore_char (&(*p)->attribute, d, off);
restore_char (&(*p)->value, d, off);
p = &(*p)->next;
counter--;
}
-
- *p = NULL;
}
static unsigned char *dump_body (BODY * c, unsigned char *d, int *off)
h->env = envelope_new();
restore_envelope (h->env, d, &off);
- h->content = mutt_new_body ();
+ h->content = body_new();
restore_body (h->content, d, &off);
restore_char (&h->maildir_flags, d, &off);