Use new mLib function annotations.

And fix a minor bug caught by them.

diff --git a/configure.ac b/configure.ac
index 66c16e7b51a2c99657a6e062ddbc3e995536ff7b..bfb91f8be20195f1c3375e618fdf0871117da853 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,7 @@ dnl Programming environments.
 dnl C compilers and libraries.
 AC_PROG_CC
 AX_CFLAGS_WARN_ALL
 dnl C compilers and libraries.
 AC_PROG_CC
 AX_CFLAGS_WARN_ALL

-PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0], [have_mlib=t], [have_mlib=nil])
+PKG_CHECK_MODULES([mLib], [mLib >= 2.2.1], [have_mlib=t], [have_mlib=nil])

 AM_CONDITIONAL([HAVE_MLIB], [test $have_mlib = t])
 
 dnl Bourne-Again Shell.
 AM_CONDITIONAL([HAVE_MLIB], [test $have_mlib = t])
 
 dnl Bourne-Again Shell.

diff --git a/debian/control b/debian/control
index 1503988570eefa3284fcd42811ac4e2b00c5acb3..4c0df732be8aab5f70a2ebb851616ac33f72ebce 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.5
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 XS-Python-Version: >= 2.5

-Build-Depends: mlib-dev (>= 2.1.0), debhelper (>= 8.1)
+Build-Depends: mlib-dev (>= 2.2.1), debhelper (>= 8.1)

 Standards-Version: 3.1.1
 
 Package: rsync-backup
 Standards-Version: 3.1.1
 
 Package: rsync-backup

diff --git a/rfreezefs.c b/rfreezefs.c
index c390c368b896b4754cf58da821738ef008ebb03a..ccc61cd40a20c2e57c7f320beb60c757b968cb3f 100644 (file)
--- a/rfreezefs.c
+++ b/rfreezefs.c
@@ -54,6 +54,7 @@
 #include <mLib/dstr.h>
 #include <mLib/base64.h>
 #include <mLib/fdflags.h>
 #include <mLib/dstr.h>
 #include <mLib/base64.h>
 #include <mLib/fdflags.h>

+#include <mLib/macros.h>

 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 #include <mLib/report.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 #include <mLib/report.h>


@@ -228,7 +229,7 @@ static size_t nfs;                  /* Number of descriptors */
 /*----- Cleanup -----------------------------------------------------------*/
 
 #define EOM ((char *)0)
 /*----- Cleanup -----------------------------------------------------------*/
 
 #define EOM ((char *)0)

-static void emerg(const char *msg,...)
+static void EXECL_LIKE(0) emerg(const char *msg,...)

 {
   va_list ap;
 
 {
   va_list ap;
 


@@ -274,12 +275,12 @@ static int sigcatch[] = {
   SIGILL, SIGSEGV, SIGBUS, SIGFPE, SIGABRT
 };
 
   SIGILL, SIGSEGV, SIGBUS, SIGFPE, SIGABRT
 };
 

-static void sigmumble(int sig)
+static void NORETURN sigmumble(int sig)

 {
   sigset_t ss;
 
   cleanup();
 {
   sigset_t ss;
 
   cleanup();

-  emerg(strsignal(sig), 0);
+  emerg(strsignal(sig), EOM);

 
   signal(sig, SIG_DFL);
   sigemptyset(&ss); sigaddset(&ss, sig);
 
   signal(sig, SIG_DFL);
   sigemptyset(&ss); sigaddset(&ss, sig);