[exim-cvs] Compiler quietening. Bug 2983

Góra strony
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
Dla: exim-cvs
Temat: [exim-cvs] Compiler quietening. Bug 2983
Gitweb: https://git.exim.org/exim.git/commitdiff/1d904e0470fed2e5c7a867f63d39ee44dbe80a2a
Commit:     1d904e0470fed2e5c7a867f63d39ee44dbe80a2a
Parent:     ecc7ae95e36be550fa4b47de2d8dfc7115eac9cb
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Mar 12 19:02:31 2023 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Mar 12 19:02:31 2023 +0000


    Compiler quietening.  Bug 2983
---
 src/src/local_scan.h |  2 +-
 src/src/readconf.c   | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)


diff --git a/src/src/local_scan.h b/src/src/local_scan.h
index 69b3c6cdb..c88994442 100644
--- 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 6dba11ca1..3b26e87d5 100644
--- 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;