Complete Dominik's name.

[~andy/fetchmail] / sink.c

diff --git a/sink.c b/sink.c
index a3f5dea371f46ec2c5a2cead90f41ff6a00ac53c..5d92556f01d5435ef1d9e1d847521a4b50d6b350 100644 (file)
--- a/sink.c
+++ b/sink.c
@@ -441,8 +441,6 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg)
 {
     int smtperr = atoi(smtp_response);
     char *responses[1];
-    struct idlist *walk;
-    int found = 0;
 
     responses[0] = xstrdup(smtp_response);
 
@@ -466,15 +464,7 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg)
      * messages, which are probably in English (none of the
      * MTAs I know about are internationalized).
      */
-    for( walk = ctl->antispam; walk; walk = walk->next )
-        if ( walk->val.status.num == smtperr ) 
-       { 
-               found=1;
-               break;
-       }
-
-    /* if (str_find(&ctl->antispam, smtperr)) */
-    if ( found )
+    if (str_find(&ctl->antispam, smtperr))
     {
        /*
         * SMTP listener explicitly refuses to deliver mail
@@ -1133,9 +1123,9 @@ static int open_mda_sink(struct query *ctl, struct msgblk *msg,
         */
        nameslen = 0;
        for (idp = msg->recipients; idp; idp = idp->next)
-           if ((idp->val.status.mark == XMIT_ACCEPT))
+           if (idp->val.status.mark == XMIT_ACCEPT)
                nameslen += (strlen(idp->id) + 1);      /* string + ' ' */
-       if ((*good_addresses == 0))
+       if (*good_addresses == 0)
            nameslen = strlen(run.postmaster);
 
        names = (char *)xmalloc(nameslen + 1);  /* account for '\0' */
@@ -1399,8 +1389,6 @@ int close_sink(struct query *ctl, struct msgblk *msg, flag forward)
            e = errno;
            sinkfp = (FILE *)NULL;
        }
-       else
-           rc = e = 0;
 
        deal_with_sigchld(); /* Restore SIGCHLD handling to reap zombies */