#include <lib-mime/mime.h>
#include "mutt.h"
-#ifdef USE_IMAP
-#include "message.h"
-#endif
+#include <imap/message.h>
#include "mx.h"
#include "lib.h"
(MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
#if HAVE_LANGINFO_CODESET
- crc = crc32 (crc, (unsigned char const *) Charset, m_strlen(Charset));
- crc =
- crc32 (crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
- m_strlen("HAVE_LANGINFO_CODESET"));
+ crc = crc32(crc, (unsigned char const *) Charset, m_strlen(Charset));
+ crc = crc32(crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
+ m_strlen("HAVE_LANGINFO_CODESET"));
#endif
-#ifdef USE_POP
- crc =
- crc32 (crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP"));
-#endif
+ crc = crc32(crc, (unsigned char const *) "USE_POP", m_strlen("USE_POP"));
#ifdef MIXMASTER
- crc =
- crc32 (crc, (unsigned char const *) "MIXMASTER",
- m_strlen("MIXMASTER"));
+ crc = crc32(crc, (unsigned char const *) "MIXMASTER",
+ m_strlen("MIXMASTER"));
#endif
-#ifdef USE_IMAP
- crc =
- crc32 (crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));
-#endif
+ crc = crc32(crc, (unsigned char const *) "USE_IMAP", m_strlen("USE_IMAP"));
#ifdef USE_NNTP
- crc =
- crc32 (crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP"));
+ crc = crc32(crc, (unsigned char const *) "USE_NNTP", m_strlen("USE_NNTP"));
#endif
return crc;
}
HEADER *mutt_hcache_restore (const unsigned char *d, HEADER ** oh)
{
int off = 0;
- HEADER *h = mutt_new_header ();
+ HEADER *h = header_new();
/* skip validate */
off += sizeof (validate);
memcpy (h, d + off, sizeof (HEADER));
off += sizeof (HEADER);
- h->env = mutt_new_envelope ();
+ h->env = envelope_new();
restore_envelope (h->env, d, &off);
h->content = mutt_new_body ();
if (oh) {
h->old = (*oh)->old;
h->path = m_strdup((*oh)->path);
- mutt_free_header (oh);
+ header_delete(oh);
}
return h;