X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fmh.h;h=53b301e5692a1c67fdf39ed2196259f7c86cc1aa;hp=a5a12ce2784911f6a1a777b6e440e9f2a215dda5;hb=ee8d01d64e8832304256de53db07228e2be67f6a;hpb=e2550f03c9679b6fcc5240f9cda48bd5a9951e3a

diff --git a/h/mh.h b/h/mh.h
index a5a12ce..53b301e 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -203,14 +203,24 @@ 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 BODY     3         /* Body  returned with more to come */
-#define FILEEOF  5         /* Reached end of input file        */
+/* m_getfld2() returned data */
+struct field {
+	char name[NAMESZ];
+	size_t namelen;
+	char *value;
+	size_t valuelen;
+	size_t alloclen;
+};
 
-extern int msg_count;        /* m_getfld() indicators (That's a hack!) */
+/* 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 */
 
@@ -294,8 +304,8 @@ extern char *seq_unseen;
 extern char *seq_neg;
 extern char *trashfolder;
 extern char *usequence;
-extern char *version_num;
-extern char *version_str;
+extern char *version;
+extern char *lib_version;
 extern char *whatnowproc;
 
 #include <h/prototypes.h>