X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Frouters%2Faccept.c;h=b02ceda7af7a27bf9a88a992fc1e741c02530e51;hb=20586bdc24045da63928cbdaace2f036e3c80bd5;hp=c08a0c20b90c28d76359815c8d87335cdb9f76e5;hpb=d185889f47b9b27088e777f7d382295c51271586;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/routers/accept.c b/src/src/routers/accept.c
index c08a0c20b..b02ceda7a 100644
--- a/src/src/routers/accept.c
+++ b/src/src/routers/accept.c
@@ -2,7 +2,8 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -15,7 +16,7 @@
 empty declarations ("undefined" in the Standard) we put in a dummy value. */
 
 optionlist accept_router_options[] = {
-  { "", opt_hidden, NULL }
+  { "", opt_hidden, {NULL} }
 };
 
 /* Size of the options list. An extern variable has to be used so that its
@@ -39,7 +40,7 @@ void accept_router_init(router_instance *rblock) {}
 int accept_router_entry(router_instance *rblock, address_item *addr,
   struct passwd *pw, int verify, address_item **addr_local,
   address_item **addr_remote, address_item **addr_new,
-  address_item **addr_succeed) {}
+  address_item **addr_succeed) {return 0;}
 
 #else	/*!MACRO_PREDEF*/
 
@@ -106,9 +107,6 @@ uschar *errors_to;
 uschar *remove_headers;
 header_line *extra_headers;
 
-addr_new = addr_new;  /* Keep picky compilers happy */
-addr_succeed = addr_succeed;
-
 DEBUG(D_route) debug_printf("%s router called for %s\n  domain = %s\n",
   rblock->name, addr->address, addr->domain);
 
@@ -117,7 +115,7 @@ DEBUG(D_route) debug_printf("%s router called for %s\n  domain = %s\n",
 rc = rf_get_errors_address(addr, rblock, verify, &errors_to);
 if (rc != OK) return rc;
 
-/* Set up the additional and removeable headers for the address. */
+/* Set up the additional and removable headers for the address. */
 
 rc = rf_get_munge_headers(addr, rblock, &extra_headers, &remove_headers);
 if (rc != OK) return rc;