X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/eedef73327bfd0d0b34eb8fa242da253e9b2a0e3..07731a50fda3a25927b60c48a41be2e5b747ca01:/h/mh.h

diff --git a/h/mh.h b/h/mh.h
index 032471aa..a72971df 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -8,9 +8,8 @@
  */
 #define	NOTOK        (-1)	/* syscall()s return this on error */
 #define	OK             0	/*  ditto on success               */
-#define	DONE           1	/* trinary logic                   */
+#define	DONE           1	/* ternary logic                   */
 #define ALL           ""
-#define	Nbby           8	/* number of bits/byte */
 
 #define MAXARGS	    1000	/* max arguments to exec                */
 #define NFOLDERS    1000	/* max folder arguments on command line */
@@ -188,20 +187,27 @@ extern struct swit anoyes[];	/* standard yes/no switches */
 
 #define	MBITS "\020\01EXISTS\02SELECTED\03NEW\04UNSEEN"
 
-/*
- * type for holding the sequence set of a message
- */
+/* A vector of bits for tracking the sequence membership of a single
+ * message.  Do not access the struct members; use vector.c.
+ * Do not move or copy this struct as it may contain a pointer to
+ * itself;  use bvector_copy(). */
+struct bvector {
+    unsigned long *bits;
+    size_t maxsize;
+    unsigned long tiny[2];   /* Default fixed-size storage for bits. */
+};
 typedef struct bvector *bvector_t;
 
-bvector_t bvector_create (size_t /* initial size in bits, can be 0 */);
+bvector_t bvector_create (void);
+void bvector_init(struct bvector *bv);
 void bvector_copy (bvector_t, bvector_t);
 void bvector_free (bvector_t);
+void bvector_fini(struct bvector *bv);
 void bvector_clear (bvector_t, size_t);
 void bvector_clear_all (bvector_t);
 void bvector_set (bvector_t, size_t);
 unsigned int bvector_at (bvector_t, size_t);
-const unsigned long *bvector_bits (bvector_t);
-size_t bvector_maxsize (bvector_t);
+unsigned long bvector_first_bits (bvector_t);
 
 typedef struct svector *svector_t;
 
@@ -220,7 +226,6 @@ void ivector_free (ivector_t);
 int ivector_push_back (ivector_t, int);
 int ivector_at (ivector_t, size_t);
 int *ivector_atp (ivector_t, size_t);
-size_t ivector_size (ivector_t);
 
 /*
  * Primary structure of folder/message information
@@ -266,7 +271,7 @@ struct msgs {
      * in a particular sequence.
      */
     size_t num_msgstats;
-    bvector_t *msgstats;	/* msg status */
+    struct bvector *msgstats;	/* msg status */
 
     /*
      * A FILE handle containing an open filehandle for the sequence file
@@ -292,7 +297,7 @@ struct msgs {
 /*
  * macros for message and sequence manipulation
  */
-#define msgstat(mp,n) (mp)->msgstats[(n) - mp->lowoff]
+#define msgstat(mp,n) ((mp)->msgstats + (n) - mp->lowoff)
 #define clear_msg_flags(mp,msgnum)   bvector_clear_all (msgstat(mp, msgnum))
 #define copy_msg_flags(mp,i,j)       bvector_copy (msgstat(mp,i), msgstat(mp,j))
 #define get_msg_flags(mp,ptr,msgnum) bvector_copy (ptr, msgstat(mp, msgnum))
@@ -332,7 +337,7 @@ struct msgs {
 #define make_seq_private(mp,seqnum) \
         bvector_set (mp->attrstats, FFATTRSLOT + seqnum)
 #define make_all_public(mp) \
-        mp->attrstats = bvector_create(0); bvector_clear_all (mp->attrstats)
+        mp->attrstats = bvector_create(); bvector_clear_all (mp->attrstats)
 
 /*
  * macros for folder attributes
@@ -368,7 +373,6 @@ struct msgs {
 #define BODY     3		/* Body  returned with more to come */
 #define FILEEOF  5		/* Reached end of input file        */
 
-struct m_getfld_state;
 typedef struct m_getfld_state *m_getfld_state_t;
 
 /*
@@ -393,7 +397,6 @@ typedef struct m_getfld_state *m_getfld_state_t;
 /*
  * credentials management
  */
-struct nmh_creds;
 typedef struct nmh_creds *nmh_creds_t;
 
 /*