shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

macro: add nice macro for disabling -Wnonnull temporarily

Browse Source
This commit is contained in:
Lennart Poettering 2014-02-20 18:44:51 +01:00
parent f0f2e63bb2
commit 8fca4e305f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/macro.h
View File

@ -59,6 +59,10 @@
_Pragma("GCC diagnostic push"); \
_Pragma("GCC diagnostic ignored \"-Wmissing-prototypes\"")
#define DISABLE_WARNING_NONNULL \
_Pragma("GCC diagnostic push"); \
_Pragma("GCC diagnostic ignored \"-Wnonnull\"")
#define REENABLE_WARNING \
_Pragma("GCC diagnostic pop")

12
src/test/test-unit-file.c
View File

@ -295,9 +295,6 @@ static void test_load_env_file_4(void) {
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnonnull"
static void test_install_printf(void) {
char name[] = "name.service",
path[] = "/run/systemd/system/name.service",
@ -343,7 +340,11 @@ static void test_install_printf(void) {
expect(i, "%p", "name");
expect(i, "%i", "");
expect(i, "%u", "xxxx-no-such-user");
DISABLE_WARNING_NONNULL;
expect(i, "%U", NULL);
REENABLE_WARNING;
expect(i, "%m", mid);
expect(i, "%b", bid);
expect(i, "%H", host);
@ -355,7 +356,11 @@ static void test_install_printf(void) {
expect(i3, "%N", "name@inst");
expect(i3, "%p", "name");
expect(i3, "%u", "xxxx-no-such-user");
DISABLE_WARNING_NONNULL;
expect(i3, "%U", NULL);
REENABLE_WARNING;
expect(i3, "%m", mid);
expect(i3, "%b", bid);
expect(i3, "%H", host);
@ -363,7 +368,6 @@ static void test_install_printf(void) {
expect(i4, "%u", "root");
expect(i4, "%U", "0");
}
#pragma GCC diagnostic pop
int main(int argc, char *argv[]) {
int r;