projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge OPS that do not need to be split anymore.
[apps/madmutt.git]
/
hcache.c
diff --git
a/hcache.c
b/hcache.c
index
8560ef6
..
953e70f
100644
(file)
--- a/
hcache.c
+++ b/
hcache.c
@@
-8,22
+8,13
@@
* It's licensed under the GNU General Public License,
* please see the file GPL in the top level source directory.
*/
* 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 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>
#if defined(HAVE_QDBM)
#include <depot.h>
#include <cabin.h>
@@
-34,16
+25,7
@@
#include <db.h>
#endif
#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-lib/macros.h>
#include <lib-hash/hash.h>
#include <lib-hash/hash.h>
-
#include <lib-mime/mime.h>
#include "charset.h"
#include <lib-mime/mime.h>
#include "charset.h"
@@
-208,7
+190,7
@@
static void restore_list (string_list_t ** l, const unsigned char *d, int *off)
*l = NULL;
}
*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;
int *off)
{
unsigned int counter = 0;
@@
-229,21
+211,19
@@
static unsigned char *dump_parameter (PARAMETER * p, unsigned char *d,
}
static void
}
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) {
{
unsigned int counter;
restore_int (&counter, d, off);
while (counter) {
- *p = p
_new(PARAMETER, 1
);
+ *p = p
arameter_new(
);
restore_char (&(*p)->attribute, d, off);
restore_char (&(*p)->value, d, off);
p = &(*p)->next;
counter--;
}
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)
}
static unsigned char *dump_body (BODY * c, unsigned char *d, int *off)
@@
-506,7
+486,7
@@
HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
h->env = envelope_new();
restore_envelope (h->env, d, &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);
restore_body (h->content, d, &off);
restore_char (&h->maildir_flags, d, &off);