sizeof char is always 1, so don't bother to divide by it.

[nmh] / h / mh.h

diff --git a/h/mh.h b/h/mh.h
index 22e3a0b5d3d2bc563875d2f23966bd49906275be..6b7dec613a75a0c9984654c767482d3169fdc064 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -51,15 +51,6 @@ typedef unsigned char  boolean;  /* not int so we can pack in a structure */
 /* FENDNULL fends off NULL by giving an empty string instead. */
 #define FENDNULL(s) ((s) ? (s) : "")
 
-/* PLURALS gives a pointer to the string "s" when n isn't 1, and to the
- * empty string "" when it is.  Suitable for obtaining the plural `s'
- * used for English nouns.  It treats -1 as plural, as does GNU gettext.
- * Having output vary for plurals is annoying for those writing parsers;
- * better to phrase the output such that no test is needed, e.g.
- * "messages found: 42". */
-extern const char plurals[];
-#define PLURALS(n) (plurals + ((n) == 1))
-
 /*
  * char array that keeps track of size in both bytes and characters
  * Usage note:
@@ -362,8 +353,6 @@ struct msgs {
 #define other_files(mp)     ((mp)->msgflags & OTHERS)
 #define set_other_files(mp) ((mp)->msgflags |= OTHERS)
 
-#define        NULLMP  ((struct msgs *) 0)
-
 /*
  * m_getfld() message parsing
  */
@@ -393,7 +382,7 @@ typedef struct m_getfld_state *m_getfld_state_t;
 #define        MS_DEFAULT      0       /* default (one msg per file) */
 #define        MS_UNKNOWN      1       /* type not known yet         */
 #define        MS_MBOX         2       /* Unix-style "from" lines    */
-#define        MS_MMDF         3       /* string mmdlm2              */
+#define        MS_MMDF         3       /* string MMDF_DELIM          */
 
 #define        NOUSE   0               /* draft being re-used */
 
@@ -441,13 +430,6 @@ extern char *defpath;              /* pathname of user's profile      */
 extern char *ctxpath;          /* pathname of user's context      */
 extern struct node *m_defs;    /* list of profile/context entries */
 
-/* What style to use for generated Message-ID and Content-ID header
-   fields.  The localname style is pid.time@localname, where time is
-   in seconds.  The random style replaces the localname with some
-   (pseudo)random bytes and uses microsecond-resolution time. */
-int save_message_id_style (const char *);
-char *message_id (time_t, int);
-
 /*
  * These standard strings are defined in config.c.  They are the
  * only system-dependent parameters in nmh, and thus by redefining