]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
main-func: automatically call static destructors from main-func.h macros
authorLennart Poettering <lennart@poettering.net>
Mon, 19 Nov 2018 19:47:46 +0000 (20:47 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 19 Nov 2018 20:14:34 +0000 (21:14 +0100)
src/basic/main-func.h

index 9ebe0ab88212e4ee6aa795582b6e2882bcd356dd..caa5885e8b015bc3511401f734d8cd7ea3e965f3 100644 (file)
@@ -3,12 +3,15 @@
 
 #include <stdlib.h>
 
+#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;            \
         }