add free_field as standard for struct field

[mmh] / uip / sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 75aa2e3..6d45d35 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -297,8 +297,6 @@ read_hdrs(struct msgs *mp, char *datesw)
 
        smsgs = (struct smsg *) mh_xcalloc((size_t) (mp->hghsel - mp->lowsel + 2),
                        sizeof(*smsgs));
-       if (smsgs == NULL)
-               adios(EX_OSERR, NULL, "unable to allocate sort storage");
 
        s = smsgs;
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -323,7 +321,7 @@ static int
 get_fields(char *datesw, int msg, struct smsg *smsg)
 {
        enum state state;
-       struct field f = {{0}};
+       struct field f = free_field;
        int compnum;
        char *msgnam;
        struct tws *tw;
@@ -357,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);