Compiler quietening. Bug 2983

diff --git a/src/src/local_scan.h b/src/src/local_scan.h
index 69b3c6cdbac50df2dad4e56c5bfc69df6e33cbc5..c8899444237137a66418b2a6346eddbf5be20fa1 100644 (file)
--- a/src/src/local_scan.h
+++ b/src/src/local_scan.h
@@ -133,7 +133,7 @@ typedef struct {
   union {
     void *     value;
     long       offset;
-    void (*    fn)();
+    void (*    fn)(const uschar *, const uschar *, unsigned);
   } v;
 } optionlist;
 #define OPT_OFF(s, field) {.offset = offsetof(s, field)}

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 6dba11ca1b29cb1c62e7d744aa7cbaa6ddd44fc9..3b26e87d5a506b04d086139aba1edea606d1e4a5 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -2356,11 +2356,8 @@ switch (type)
     }
 
   case opt_func:
-    {
-    void (*fn)() = ol->v.fn;
-    fn(name, s, 0);
+    ol->v.fn(name, s, 0);
     break;
-    }
   }
 
 return TRUE;
@@ -2384,11 +2381,7 @@ readconf_printtime(int t)
 int s, m, h, d, w;
 uschar *p = time_buffer;
 
-if (t < 0)
-  {
-  *p++ = '-';
-  t = -t;
-  }
+if (t < 0) *p++ = '-', t = -t;
 
 s = t % 60;
 t /= 60;