Finally we get rid of the unmaintainable m_getfld()!

[mmh] / h / mh.h

diff --git a/h/mh.h b/h/mh.h
index 8107a3e..8f6fad1 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -203,6 +203,7 @@ struct msgs {
                            ** terminating NULL.
                            */
 
+/* m_getfld2() returned data */
 struct field {
        char name[NAMESZ];
        size_t namelen;
@@ -211,24 +212,16 @@ struct field {
        size_t alloclen;
 };
 
+/* m_getfld2() states */
 enum state {
-       LENERR2 = -2,
-       FMTERR2 = -3,
-       IOERR2 = -1,
-       FLD2 = 0,
-       BODY2,
-       FILEEOF2,
+       LENERR2 = -2,      /* Line too long */
+       FMTERR2 = -3,      /* Format error in message */
+       IOERR2 = -1,       /* Read error */
+       FLD2 = 0,          /* Header field returned */
+       BODY2,             /* Body line returned */
+       FILEEOF2,          /* Reached end of input file */
 };
 
-#define LENERR   (-2)      /* Name too long error from getfld  */
-#define FMTERR   (-3)      /* Message Format error             */
-#define FLD      0         /* Field returned                   */
-#define FLDPLUS  1         /* Field returned with more to come */
-#define BODY     3         /* Body  returned with more to come */
-#define FILEEOF  5         /* Reached end of input file        */
-
-extern int msg_count;        /* m_getfld() indicators (That's a hack!) */
-
 #define NOUSE    0        /* draft being re-used */
 
 #define OUTPUTLINELEN  72    /* default line length for headers */