Mercurial > masqmail-0.2
comparison src/spool.c @ 108:46f407c0727a
exchange of the if parts to simplify the condition
author | meillo@marmaro.de |
---|---|
date | Tue, 29 Jun 2010 11:00:33 +0200 |
parents | 83a182793503 |
children | a80ebfa16cd5 |
comparison
equal
deleted
inserted
replaced
107:9104234a56a5 | 108:46f407c0727a |
---|---|
148 msg->return_path = create_address(&(buf[3]), TRUE); | 148 msg->return_path = create_address(&(buf[3]), TRUE); |
149 DEBUG(3) debugf("spool_read: MAIL FROM: %s", msg->return_path->address); | 149 DEBUG(3) debugf("spool_read: MAIL FROM: %s", msg->return_path->address); |
150 } else if (strncasecmp(buf, "RT:", 3) == 0) { | 150 } else if (strncasecmp(buf, "RT:", 3) == 0) { |
151 address *addr; | 151 address *addr; |
152 addr = spool_scan_rcpt(buf); | 152 addr = spool_scan_rcpt(buf); |
153 if (!addr_is_delivered(addr) && !addr_is_failed(addr)) { | 153 if (addr_is_delivered(addr) || addr_is_failed(addr)) { |
154 msg->non_rcpt_list = g_list_append(msg->non_rcpt_list, addr); | |
155 } else { | |
154 msg->rcpt_list = g_list_append(msg->rcpt_list, addr); | 156 msg->rcpt_list = g_list_append(msg->rcpt_list, addr); |
155 } else { | |
156 msg->non_rcpt_list = g_list_append(msg->non_rcpt_list, addr); | |
157 } | 157 } |
158 } else if (strncasecmp(buf, "PR:", 3) == 0) { | 158 } else if (strncasecmp(buf, "PR:", 3) == 0) { |
159 prot_id i; | 159 prot_id i; |
160 for (i = 0; i < PROT_NUM; i++) { | 160 for (i = 0; i < PROT_NUM; i++) { |
161 if (strncasecmp(prot_names[i], &(buf[3]), strlen(prot_names[i])) == 0) { | 161 if (strncasecmp(prot_names[i], &(buf[3]), strlen(prot_names[i])) == 0) { |