util-lib: move main() definition macros to its own header file

This way, we can extend the macro a bit with stuff pulled in from other
headers without this affecting everything which pulls in macro.h, which
is one of our most basic headers.

This is just refactoring, no change in behaviour, in prepartion for
later changes.
This commit is contained in:
Lennart Poettering
2018-11-19 21:14:34 +01:00
parent 2a44bf5099
commit 5e332028f2
35 changed files with 61 additions and 24 deletions
-19
View File
@@ -506,23 +506,4 @@ static inline int __coverity_check__(int condition) {
DEFINE_PUBLIC_TRIVIAL_REF_FUNC(type, name); \
DEFINE_PUBLIC_TRIVIAL_UNREF_FUNC(type, name, free_func);
/* 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); \
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; \
}
/* Zero is mapped to EXIT_SUCCESS, and both negative and positive values
* are mapped to EXIT_FAILURE.
* Note: this means "true" maps to EXIT_FAILURE. */
#define DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(impl) \
int main(int argc, char *argv[]) { \
int r; \
r = impl(argc, argv); \
return r != 0 ? EXIT_FAILURE : EXIT_SUCCESS; \
}
#include "log.h"
+23
View File
@@ -0,0 +1,23 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
#include <stdlib.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); \
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; \
}
/* Zero is mapped to EXIT_SUCCESS, and both negative and positive values
* are mapped to EXIT_FAILURE.
* Note: this means "true" maps to EXIT_FAILURE. */
#define DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(impl) \
int main(int argc, char *argv[]) { \
int r; \
r = impl(argc, argv); \
return r != 0 ? EXIT_FAILURE : EXIT_SUCCESS; \
}