git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad5a1b1
)
tidying
author
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 2 Sep 2021 14:16:46 +0000
(15:16 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 2 Sep 2021 14:16:46 +0000
(15:16 +0100)
src/src/exim.c
patch
|
blob
|
history
diff --git
a/src/src/exim.c
b/src/src/exim.c
index a42c48b2ca81e488cf556ac54353b7a39c0c3a61..37e1b756a9a2641fdbf9dcc63e6dfab44b422dea 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1644,7
+1644,6
@@
BOOL list_queue = FALSE;
BOOL list_options = FALSE;
BOOL list_config = FALSE;
BOOL local_queue_only;
BOOL list_options = FALSE;
BOOL list_config = FALSE;
BOOL local_queue_only;
-BOOL more = TRUE;
BOOL one_msg_action = FALSE;
BOOL opt_D_used = FALSE;
BOOL queue_only_set = FALSE;
BOOL one_msg_action = FALSE;
BOOL opt_D_used = FALSE;
BOOL queue_only_set = FALSE;
@@
-5498,7
+5497,7
@@
real_sender_address = sender_address;
messages to be read (SMTP input), or FALSE otherwise (not SMTP, or SMTP channel
collapsed). */
messages to be read (SMTP input), or FALSE otherwise (not SMTP, or SMTP channel
collapsed). */
-
while (more
)
+
for (BOOL more = TRUE; more;
)
{
rmark reset_point = store_mark();
message_id[0] = 0;
{
rmark reset_point = store_mark();
message_id[0] = 0;
@@
-5540,10
+5539,10
@@
while (more)
/* Now get the data for the message */
more = receive_msg(extract_recipients);
/* Now get the data for the message */
more = receive_msg(extract_recipients);
- if (
message_id[0] == 0
)
+ if (
!message_id[0]
)
{
cancel_cutthrough_connection(TRUE, US"receive dropped");
{
cancel_cutthrough_connection(TRUE, US"receive dropped");
- if (more) goto
moreloop
;
+ if (more) goto
MORELOOP
;
smtp_log_no_mail(); /* Log no mail if configured */
exim_exit(EXIT_FAILURE);
}
smtp_log_no_mail(); /* Log no mail if configured */
exim_exit(EXIT_FAILURE);
}
@@
-5709,7
+5708,7
@@
while (more)
for real; when reading the headers of a message for filter testing,
it is TRUE if the headers were terminated by '.' and FALSE otherwise. */
for real; when reading the headers of a message for filter testing,
it is TRUE if the headers were terminated by '.' and FALSE otherwise. */
- if (
message_id[0] == 0
) exim_exit(EXIT_FAILURE);
+ if (
!message_id[0]
) exim_exit(EXIT_FAILURE);
} /* Non-SMTP message reception */
/* If this is a filter testing run, there are headers in store, but
} /* Non-SMTP message reception */
/* If this is a filter testing run, there are headers in store, but
@@
-5902,11
+5901,11
@@
while (more)
finished subprocesses here, in case there are lots of messages coming in
from the same source. */
finished subprocesses here, in case there are lots of messages coming in
from the same source. */
-
#ifndef SIG_IGN_WORKS
+#ifndef SIG_IGN_WORKS
while (waitpid(-1, NULL, WNOHANG) > 0);
while (waitpid(-1, NULL, WNOHANG) > 0);
-
#endif
+#endif
-
moreloop
:
+
MORELOOP
:
return_path = sender_address = NULL;
authenticated_sender = NULL;
deliver_localpart_orig = NULL;
return_path = sender_address = NULL;
authenticated_sender = NULL;
deliver_localpart_orig = NULL;