Use new `mLib' function annotations.

diff --git a/blast.c b/blast.c
index 60ef0f7..cda5346 100644 (file)
--- a/blast.c
+++ b/blast.c
@@ -16,6 +16,7 @@
 
 #include <mLib/alloc.h>
 #include <mLib/conn.h>
+#include <mLib/macros.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 #include <mLib/report.h>
@@ -34,7 +35,7 @@ static struct timeval ctv = { 0, 500000 };
 static sel_timer sec;
 static unsigned count = 0;
 
-static void timers(void);
+static void IGNORABLE timers(void);
 
 static void stats(struct timeval *tv, void *p)
 {

diff --git a/configure.ac b/configure.ac
index 1e8800c..fac3e56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AC_SEARCH_LIBS([socket], [socket])
 AC_SEARCH_LIBS([gethostbyname], [nsl resolv])
 
 dnl Packages.
-PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0])
+PKG_CHECK_MODULES([mLib], [mLib >= 2.2.1])
 
 dnl Functions.
 AC_CHECK_FUNCS([inet_aton])

diff --git a/debian/control b/debian/control
index 8263a66..d53fdce 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: fwd
 Section: net
 Priority: extra
-Build-Depends: mlib-dev (>= 2.0.3), debhelper (>= 4.0.2)
+Build-Depends: mlib-dev (>= 2.2.1), debhelper (>= 8)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Standards-Version: 3.1.1
 

diff --git a/fwd.h b/fwd.h
index 5868fda..ba06144 100644 (file)
--- a/fwd.h
+++ b/fwd.h
@@ -87,6 +87,7 @@
 #include <mLib/fdflags.h>
 #include <mLib/fdpass.h>
 #include <mLib/ident.h>
+#include <mLib/macros.h>
 #include <mLib/mdup.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
@@ -281,7 +282,8 @@ extern const char option_text[];
  * Use:                Logs a connection.
  */
 
-extern void fw_log(time_t /*t*/, const char */*fmt*/, ...);
+extern void PRINTF_LIKE(2, 3)
+  fw_log(time_t /*t*/, const char */*fmt*/, ...);
 
 /* --- @fw_inc@, @fw_dec@ --- *
  *
@@ -529,7 +531,8 @@ extern int token(scanner */*sc*/);
  * Use:                Reports an error at the current scanner location.
  */
 
-extern void error(scanner */*sc*/, const char */*msg*/, ...);
+extern void PRINTF_LIKE(2, 3) NORETURN
+  error(scanner */*sc*/, const char */*msg*/, ...);
 
 /* --- @pushback@ --- *
  *