m_getfld2: ERR2 means a read error, thus name it IOERR2

diff --git a/h/mh.h b/h/mh.h
index a93d9a940710a5804b6714e8c22f82f3503d0312..8107a3e326fbae377482d0ae95757e41de14978d 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -214,7 +214,7 @@ struct field {
 enum state {
        LENERR2 = -2,
        FMTERR2 = -3,
-       ERR2 = -1,
+       IOERR2 = -1,
        FLD2 = 0,
        BODY2,
        FILEEOF2,

diff --git a/sbr/m_getfld2.c b/sbr/m_getfld2.c
index a17eb03a82c3960ea5f3d894393af1e9d2cbf53c..59204252d7f8c5eec7305138825e097ca0e1c601 100644 (file)
--- a/sbr/m_getfld2.c
+++ b/sbr/m_getfld2.c
@@ -27,7 +27,7 @@ static size_t copyname(char *, char *);
 
 /*
 ** For the states FLD2, BODY2 and FMTERR2 memory is allocated for f->value.
-** For the states LENERR2, ERR2 and FILEEOF2 no memory is allocated.
+** For the states LENERR2, IOERR2 and FILEEOF2 no memory is allocated.
 */
 enum state
 m_getfld2(enum state s, struct field *f, FILE *msg)
@@ -42,7 +42,7 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
                if (feof(msg)) {
                        return FILEEOF2;
                } else {
-                       return ERR2;
+                       return IOERR2;
                }
        }
 
@@ -95,7 +95,7 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
                        nchars = getline(&tmpline, &len, msg);
                        if (nchars <= 0) {
                                free(tmpline);
-                               return ERR2;
+                               return IOERR2;
                        }
 
                        if (nchars >= NAMESZ) {
@@ -125,7 +125,7 @@ m_getfld2(enum state s, struct field *f, FILE *msg)
 
                if (falted == FAIL) {
                        free(tmpline);
-                       return ERR2;
+                       return IOERR2;
                }
 
                free(tmpline);

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 494c2986bbe621b6bfeac2d9b59324c2bac84826..9c20fdaded6a714ed896f1a6d767ebe15a63e6e0 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -77,7 +77,7 @@ distout(char *drft, char *msgnam, char *backup)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        advise(NULL, "Please re-edit draft and fix that header.");
 leave_bad: ;
                        fclose(ifp);
@@ -194,7 +194,7 @@ ready_msg(char *msgnam)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        advise(NULL, "format error in message %s", msgnam);
                        return NOTOK;
 

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index b8e9f93a3bc0dc00f5d93bfa34c8e7c989bd7be7..ec5623a6633dba52458fbeb8be97aa8c79ea11cf 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -385,7 +385,7 @@ build_mime(char *infile)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        adios(EX_CONFIG, NULL, "message format error in component #%d",
                                        compnum);
 

diff --git a/uip/mhl.c b/uip/mhl.c
index fcdb77f7312386a2265ce81ebc136693b49b40e4..8becba9bb1a50ecd874d9b558431f9387e63c902 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -699,7 +699,7 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        advise(NULL, "format error in message %s", mname);
                        exitstat++;
                        return;

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 1cbefed05d59c05bb1e7a7faaf1722548fd37ab3..257bc66e914318154a612af0a0a77f26bfb6c2b0 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -269,7 +269,7 @@ get_content(FILE *in, char *file, int toplevel)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        adios(EX_DATAERR, NULL, "message format error in component #%d",
                                        compnum);
 

diff --git a/uip/pick.c b/uip/pick.c
index a5e658d126554e9579e1feacbb29db8c163220f1..993527b471828578e444f703cdd7fd91419877bc 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -1262,7 +1262,7 @@ plist
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        advise(NULL, "format error in message %d", msgnum);
                        /* FALL */
 

diff --git a/uip/slocal.c b/uip/slocal.c
index 5760a83db3d78bc6228af2d12c57a0fdc471f196..c3b45e87aaf8b3b7b8a068fa2a675bb28ebf4b00 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -795,7 +795,7 @@ parse(int fd)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        advise(NULL, "format error in message");
                        break;
 

diff --git a/uip/sortm.c b/uip/sortm.c
index 43dc7dc0bbed6cdef9623293e9a06e63754e4146..61953e17fbe7fbcb61737b22ee1c384d80992bf0 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -355,7 +355,7 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        admonish(NULL, "format error in message %d (header #%d)", msg, compnum);
                        if (datecomp) {
                                free(datecomp);

diff --git a/uip/spost.c b/uip/spost.c
index 6282e751f9509644c984528a250070c6893f8908..04479a1f6247e2ebcd3afbd1c2bc721ea254b3d6 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -253,7 +253,7 @@ main(int argc, char **argv)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        adios(EX_DATAERR, NULL, "message format error in component #%d",
                                        compnum);
 

diff --git a/uip/whom.c b/uip/whom.c
index e1aab77f93f22813a52738d904dd1eaf1ed32032..a72c84f0977d88ad413c2d103018482a5676ba00 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -225,7 +225,7 @@ process(char *file)
 
                case LENERR2:
                case FMTERR2:
-               case ERR2:
+               case IOERR2:
                        adios(EX_DATAERR, NULL, "message format error in component #%d",
                                        compnum);