Merge branch 'master' into 4.next

[user/henk/code/exim.git] / src / src / transports / appendfile.c

diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index a9abe8ad07d1bf9170561dd1b3bbe8fd518871d5..3b463c644bf326551f1c009ac43863c029c8d000 100644 (file)
--- a/src/src/transports/appendfile.c
+++ b/src/src/transports/appendfile.c
@@ -655,7 +655,7 @@ for (h = &host; h; h = h->next)
 
   /* Connect never fails for a UDP socket, so don't set a timeout. */
 
-  (void)ip_connect(sock, host_af, h->address, ntohs(sp->s_port), 0, FALSE);
+  (void)ip_connect(sock, host_af, h->address, ntohs(sp->s_port), 0, NULL);
   rc = send(sock, buffer, Ustrlen(buffer) + 1, 0);
   (void)close(sock);
 
@@ -941,7 +941,7 @@ copy_mbx_message(int to_fd, int from_fd, off_t saved_size)
 int used;
 off_t size;
 struct stat statbuf;
-transport_ctx tctx = {0};
+transport_ctx tctx = {{0}};
 
 tctx.u.fd = to_fd;
 
@@ -2917,7 +2917,7 @@ at initialization time. */
 if (yield == OK)
   {
   transport_ctx tctx = {
-    fd,
+    {fd},
     tblock,
     addr,
     ob->check_string,