The NNTP patch is a joke, let's drop it altogether.

[apps/madmutt.git] / lib-mx / hcache.c

diff --git a/lib-mx/hcache.c b/lib-mx/hcache.c
index c3fca8d..bb38c81 100644 (file)
--- a/lib-mx/hcache.c
+++ b/lib-mx/hcache.c
@@ -59,11 +59,7 @@ static int generate_crc32(void)
     crc = crc32(crc, mod_cset.charset, m_strlen(mod_cset.charset));
 #endif
     crc = crc32(crc, "USE_POP",   m_strlen("USE_POP"));
     crc = crc32(crc, mod_cset.charset, m_strlen(mod_cset.charset));
 #endif
     crc = crc32(crc, "USE_POP",   m_strlen("USE_POP"));

-    crc = crc32(crc, "MIXMASTER", m_strlen("MIXMASTER"));

     crc = crc32(crc, "USE_IMAP",  m_strlen("USE_IMAP"));
     crc = crc32(crc, "USE_IMAP",  m_strlen("USE_IMAP"));

-#ifdef USE_NNTP
-    crc = crc32(crc, "USE_NNTP",  m_strlen("USE_NNTP"));
-#endif

     return crc;
 }
 
     return crc;
 }
 


@@ -277,12 +273,6 @@ static void dump_envelope(buffer_t *buf, ENVELOPE * e)
     dump_cstr(buf, e->x_label);
     dump_cstr(buf, e->list_post);
 
     dump_cstr(buf, e->x_label);
     dump_cstr(buf, e->list_post);
 

-#ifdef USE_NNTP
-    dump_cstr(buf, e->newsgroups);
-    dump_cstr(buf, e->xref);
-    dump_cstr(buf, e->followup_to);
-#endif
-

     dump_list(buf, e->references);
     dump_list(buf, e->in_reply_to);
     dump_list(buf, e->userhdrs);
     dump_list(buf, e->references);
     dump_list(buf, e->in_reply_to);
     dump_list(buf, e->userhdrs);


@@ -314,16 +304,9 @@ static const void *restore_envelope(const char *d, ENVELOPE *e)
     d = restore_cstr(d, &e->x_label);
     d = restore_cstr(d, &e->list_post);
 
     d = restore_cstr(d, &e->x_label);
     d = restore_cstr(d, &e->list_post);
 

-#ifdef USE_NNTP
-    d = restore_cstr(d, &e->newsgroups);
-    d = restore_cstr(d, &e->xref);
-    d = restore_cstr(d, &e->followup_to);
-#endif
-

     d = restore_list(d, &e->references);
     d = restore_list(d, &e->in_reply_to);
     d = restore_list(d, &e->userhdrs);
     d = restore_list(d, &e->references);
     d = restore_list(d, &e->in_reply_to);
     d = restore_list(d, &e->userhdrs);

-

     return d;
 }
 
     return d;
 }
 


@@ -392,15 +375,9 @@ hcache_t *mutt_hcache_open(const char *folder)
 
     {
 #if defined(HAVE_QDBM)
 
     {
 #if defined(HAVE_QDBM)

-        int flags = VL_OWRITER | VL_OCREAT;
-        if (option(OPTHCACHECOMPRESS))
-            flags |= VL_OZCOMP;
-
-        h->db = vlopen(path, flags, VL_CMPLEX);
+        h->db = vlopen(path, VL_OWRITER | VL_OCREAT, VL_CMPLEX);

 #elif defined(HAVE_GDBM)
 #elif defined(HAVE_GDBM)

-        int pagesize = atoi(HeaderCachePageSize) ?: 16384;
-
-        h->db = gdbm_open((char *) path, pagesize, GDBM_WRCREAT, 00600, NULL);
+        h->db = gdbm_open((char *) path, 16384, GDBM_WRCREAT, 00600, NULL);

 #endif
     }
 
 #endif
     }