From 8a4fdaf2921db52e46b800b6540f8e99853b556f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 19 Nov 2018 20:47:46 +0100 Subject: [PATCH] main-func: automatically call static destructors from main-func.h macros --- src/basic/main-func.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/basic/main-func.h b/src/basic/main-func.h index 9ebe0ab882..caa5885e8b 100644 --- a/src/basic/main-func.h +++ b/src/basic/main-func.h @@ -3,12 +3,15 @@ #include +#include "static-destruct.h" + /* Negative return values from impl are mapped to EXIT_FAILURE, and * everything else means success! */ #define DEFINE_MAIN_FUNCTION(impl) \ int main(int argc, char *argv[]) { \ int r; \ r = impl(argc, argv); \ + static_destruct(); \ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; \ } @@ -19,5 +22,6 @@ int main(int argc, char *argv[]) { \ int r; \ r = impl(argc, argv); \ + static_destruct(); \ return r != 0 ? EXIT_FAILURE : EXIT_SUCCESS; \ }