dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-20 22:40:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: drop unnecessary __useless_struct_to_allow_trailing_semicolon__

Browse Source 
ISO C does not allow empty statements outside of functions, and gcc
will warn the trailing semicolons when compiling with -pedantic:

  warning: ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]

But our code cannot compile with -pedantic anyway, at least because

  warning: ISO C does not support ‘__PRETTY_FUNCTION__’ predefined identifier [-Wpedantic]

Without -pedatnic, clang and even old gcc (3.4) generate no warnings about
those semicolons, so let's just drop __useless_struct_to_allow_trailing_semicolon__.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-03-06 09:34:03 +01:00
parent eef03d70c1
commit f6a8265b9a
8 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/dbus-util.h
View File

@@ -48,8 +48,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_DEFINE_SET_TRANSIENT_IS_VALID(function, bus_type, type, cast_type, fmt, check) \
int bus_set_transient_##function( \
@@ -80,8 +79,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_DEFINE_SET_TRANSIENT_TO_STRING(function, bus_type, type, cast_type, fmt, to_string) \
int bus_set_transient_##function( \
@@ -114,8 +112,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(function, bus_type, type, cast_type, fmt, to_string) \
int bus_set_transient_##function( \
@@ -150,8 +147,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_DEFINE_SET_TRANSIENT_PARSE(function, type, parse) \
int bus_set_transient_##function( \
@@ -184,8 +180,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_DEFINE_SET_TRANSIENT_PARSE_PTR(function, type, parse) \
int bus_set_transient_##function( \
@@ -218,8 +213,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(function, check) \
int bus_set_transient_##function( \
@@ -253,8 +247,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_DEFINE_SET_CGROUP_WEIGHT(function, mask, check, val, str) \
int bus_cgroup_set_##function( \
@@ -291,8 +284,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_DEFINE_SET_CGROUP_SCALE(function, mask, scale) \
int bus_cgroup_set_##function##_scale( \
@@ -333,8 +325,7 @@
} \
\
return 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
int bus_set_transient_mode_t(Unit *u, const char *name, mode_t *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
int bus_set_transient_unsigned(Unit *u, const char *name, unsigned *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);