Move m_getfld's MS_* mbox-type macros to the only user.

[nmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index fe79c2953f2eae599ed29c63f9d2484d2c27e62a..e63ce75519191b037041055dacfd28c7d9099818 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -384,10 +384,10 @@ insert (struct mailname *np)
        return 0;
 
     for (mp = &mq; mp->m_next; mp = mp->m_next) {
-       if (!strcasecmp (np->m_host ? np->m_host : "",
-                        mp->m_next->m_host ? mp->m_next->m_host : "")  &&
-           !strcasecmp (np->m_mbox ? np->m_mbox : "",
-                        mp->m_next->m_mbox ? mp->m_next->m_mbox : ""))
+       if (!strcasecmp (FENDNULL(np->m_host),
+                        FENDNULL(mp->m_next->m_host))  &&
+           !strcasecmp (FENDNULL(np->m_mbox),
+                        FENDNULL(mp->m_next->m_mbox)))
            return 0;
     }
     if (!ccme && ismymbox (np))
@@ -426,7 +426,7 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
        adios (filter, "unable to read");
 
     rewind (in);
-    lseek (fileno(in), (off_t) 0, SEEK_SET);
+    lseek(fileno(in), 0, SEEK_SET);
 
     arglist = argsplit(mhlproc, &mhl, &argnum);