X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fmh.h;h=481f2f1ca16645124da2df5922dd68c2171c5385;hp=f9ed6455971175e4c88af5208c225afff5f70b10;hb=a87df3543d3bc128ba4079d1f95638476ba5ca50;hpb=d254c5e2ad008f26d5fda43c3f24f0a711c7e851

diff --git a/h/mh.h b/h/mh.h
index f9ed645..481f2f1 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -203,16 +203,26 @@ struct msgs {
                            ** terminating NULL.
                            */
 
-#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 FLDEOF   2         /* Field returned ending at eom     */
-#define BODY     3         /* Body  returned with more to come */
-#define BODYEOF  4         /* Body  returned ending at eom     */
-#define FILEEOF  5         /* Reached end of input file        */
-
-extern int msg_count;        /* m_getfld() indicators (That's a hack!) */
+/* m_getfld2() returned data */
+struct field {
+	char name[NAMESZ];
+	size_t namelen;
+	char *value;
+	size_t valuelen;
+	size_t alloclen;
+};
+
+extern struct field free_field;
+
+/* m_getfld2() states */
+enum state {
+	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 NOUSE    0        /* draft being re-used */