SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions 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 10:41:41 +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
src/basic/macro.h
+1 -2
View File
@@ -428,7 +428,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
static inline void func##p(type *p) { \ static inline void func##p(type *p) { \
if (*p) \ if (*p) \
func(*p); \ func(*p); \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#include "log.h" #include "log.h"
src/basic/nss-util.h
+2 -4
View File
@@ -116,8 +116,7 @@ enum nss_status _nss_##module##_gethostbyname_r( \
NULL, \ NULL, \
NULL); \ NULL); \
return ret; \ return ret; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define NSS_GETHOSTBYADDR_FALLBACKS(module) \ #define NSS_GETHOSTBYADDR_FALLBACKS(module) \
enum nss_status _nss_##module##_gethostbyaddr_r( \ enum nss_status _nss_##module##_gethostbyaddr_r( \
@@ -133,8 +132,7 @@ enum nss_status _nss_##module##_gethostbyaddr_r( \
buffer, buflen, \ buffer, buflen, \
errnop, h_errnop, \ errnop, h_errnop, \
NULL); \ NULL); \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define NSS_GETPW_PROTOTYPES(module) \ #define NSS_GETPW_PROTOTYPES(module) \
enum nss_status _nss_##module##_getpwnam_r( \ enum nss_status _nss_##module##_getpwnam_r( \
src/basic/string-table.h
+3 -6
View File
@@ -93,13 +93,11 @@ ssize_t string_table_lookup(const char * const *table, size_t len, const char *k
#define _DEFINE_STRING_TABLE_LOOKUP(name,type,scope) \ #define _DEFINE_STRING_TABLE_LOOKUP(name,type,scope) \
_DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,scope) \ _DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,scope) \
_DEFINE_STRING_TABLE_LOOKUP_FROM_STRING(name,type,scope) \ _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING(name,type,scope)
struct __useless_struct_to_allow_trailing_semicolon__
#define _DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(name,type,yes,scope) \ #define _DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(name,type,yes,scope) \
_DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,scope) \ _DEFINE_STRING_TABLE_LOOKUP_TO_STRING(name,type,scope) \
_DEFINE_STRING_TABLE_LOOKUP_FROM_STRING_WITH_BOOLEAN(name,type,yes,scope) \ _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING_WITH_BOOLEAN(name,type,yes,scope)
struct __useless_struct_to_allow_trailing_semicolon__
#define DEFINE_STRING_TABLE_LOOKUP(name,type) _DEFINE_STRING_TABLE_LOOKUP(name,type,) #define DEFINE_STRING_TABLE_LOOKUP(name,type) _DEFINE_STRING_TABLE_LOOKUP(name,type,)
#define DEFINE_PRIVATE_STRING_TABLE_LOOKUP(name,type) _DEFINE_STRING_TABLE_LOOKUP(name,type,static) #define DEFINE_PRIVATE_STRING_TABLE_LOOKUP(name,type) _DEFINE_STRING_TABLE_LOOKUP(name,type,static)
@@ -111,8 +109,7 @@ ssize_t string_table_lookup(const char * const *table, size_t len, const char *k
/* For string conversions where numbers are also acceptable */ /* For string conversions where numbers are also acceptable */
#define DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(name,type,max) \ #define DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(name,type,max) \
_DEFINE_STRING_TABLE_LOOKUP_TO_STRING_FALLBACK(name,type,max,) \ _DEFINE_STRING_TABLE_LOOKUP_TO_STRING_FALLBACK(name,type,max,) \
_DEFINE_STRING_TABLE_LOOKUP_FROM_STRING_FALLBACK(name,type,max,) \ _DEFINE_STRING_TABLE_LOOKUP_FROM_STRING_FALLBACK(name,type,max,)
struct __useless_struct_to_allow_trailing_semicolon__
#define DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING_FALLBACK(name,type,max) \ #define DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING_FALLBACK(name,type,max) \
_DEFINE_STRING_TABLE_LOOKUP_TO_STRING_FALLBACK(name,type,max,static) _DEFINE_STRING_TABLE_LOOKUP_TO_STRING_FALLBACK(name,type,max,static)
src/basic/terminal-util.h
+2 -5
View File
@@ -133,16 +133,13 @@ bool dev_console_colors_enabled(void);
#define DEFINE_ANSI_FUNC(name, NAME) \ #define DEFINE_ANSI_FUNC(name, NAME) \
static inline const char *ansi_##name(void) { \ static inline const char *ansi_##name(void) { \
return colors_enabled() ? ANSI_##NAME : ""; \ return colors_enabled() ? ANSI_##NAME : ""; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define DEFINE_ANSI_FUNC_UNDERLINE(name, NAME, REPLACEMENT) \ #define DEFINE_ANSI_FUNC_UNDERLINE(name, NAME, REPLACEMENT) \
static inline const char *ansi_##name(void) { \ static inline const char *ansi_##name(void) { \
return underline_enabled() ? ANSI_##NAME : \ return underline_enabled() ? ANSI_##NAME : \
colors_enabled() ? ANSI_##REPLACEMENT : ""; \ colors_enabled() ? ANSI_##REPLACEMENT : ""; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
DEFINE_ANSI_FUNC(highlight, HIGHLIGHT); DEFINE_ANSI_FUNC(highlight, HIGHLIGHT);
DEFINE_ANSI_FUNC(highlight_red, HIGHLIGHT_RED); DEFINE_ANSI_FUNC(highlight_red, HIGHLIGHT_RED);
src/core/dbus-util.h
+9 -18
View File
@@ -48,8 +48,7 @@
} \ } \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define BUS_DEFINE_SET_TRANSIENT_IS_VALID(function, bus_type, type, cast_type, fmt, check) \ #define BUS_DEFINE_SET_TRANSIENT_IS_VALID(function, bus_type, type, cast_type, fmt, check) \
int bus_set_transient_##function( \ int bus_set_transient_##function( \
@@ -80,8 +79,7 @@
} \ } \
\ \
return 1; \ 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) \ #define BUS_DEFINE_SET_TRANSIENT_TO_STRING(function, bus_type, type, cast_type, fmt, to_string) \
int bus_set_transient_##function( \ int bus_set_transient_##function( \
@@ -114,8 +112,7 @@
} \ } \
\ \
return 1; \ 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) \ #define BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(function, bus_type, type, cast_type, fmt, to_string) \
int bus_set_transient_##function( \ int bus_set_transient_##function( \
@@ -150,8 +147,7 @@
} \ } \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define BUS_DEFINE_SET_TRANSIENT_PARSE(function, type, parse) \ #define BUS_DEFINE_SET_TRANSIENT_PARSE(function, type, parse) \
int bus_set_transient_##function( \ int bus_set_transient_##function( \
@@ -184,8 +180,7 @@
} \ } \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define BUS_DEFINE_SET_TRANSIENT_PARSE_PTR(function, type, parse) \ #define BUS_DEFINE_SET_TRANSIENT_PARSE_PTR(function, type, parse) \
int bus_set_transient_##function( \ int bus_set_transient_##function( \
@@ -218,8 +213,7 @@
} \ } \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(function, check) \ #define BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(function, check) \
int bus_set_transient_##function( \ int bus_set_transient_##function( \
@@ -253,8 +247,7 @@
} \ } \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define BUS_DEFINE_SET_CGROUP_WEIGHT(function, mask, check, val, str) \ #define BUS_DEFINE_SET_CGROUP_WEIGHT(function, mask, check, val, str) \
int bus_cgroup_set_##function( \ int bus_cgroup_set_##function( \
@@ -291,8 +284,7 @@
} \ } \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define BUS_DEFINE_SET_CGROUP_SCALE(function, mask, scale) \ #define BUS_DEFINE_SET_CGROUP_SCALE(function, mask, scale) \
int bus_cgroup_set_##function##_scale( \ int bus_cgroup_set_##function##_scale( \
@@ -333,8 +325,7 @@
} \ } \
\ \
return 1; \ 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_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); int bus_set_transient_unsigned(Unit *u, const char *name, unsigned *p, sd_bus_message *message, UnitWriteFlags flags, sd_bus_error *error);
src/shared/bus-unit-util.c
+2 -4
View File
@@ -91,8 +91,7 @@ int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
return bus_log_create_error(r); \ return bus_log_create_error(r); \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define DEFINE_BUS_APPEND_PARSE(bus_type, parse_func) \ #define DEFINE_BUS_APPEND_PARSE(bus_type, parse_func) \
static int bus_append_##parse_func( \ static int bus_append_##parse_func( \
@@ -113,8 +112,7 @@ int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
return bus_log_create_error(r); \ return bus_log_create_error(r); \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
DEFINE_BUS_APPEND_PARSE("b", parse_boolean); DEFINE_BUS_APPEND_PARSE("b", parse_boolean);
DEFINE_BUS_APPEND_PARSE("i", ioprio_class_from_string); DEFINE_BUS_APPEND_PARSE("i", ioprio_class_from_string);
src/shared/bus-util.h
+1 -2
View File
@@ -150,8 +150,7 @@ int bus_log_create_error(int r);
return r; \ return r; \
\ \
return 1; \ return 1; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
#define BUS_PROPERTY_DUAL_TIMESTAMP(name, offset, flags) \ #define BUS_PROPERTY_DUAL_TIMESTAMP(name, offset, flags) \
SD_BUS_PROPERTY(name, "t", bus_property_get_usec, (offset) + offsetof(struct dual_timestamp, realtime), (flags)), \ SD_BUS_PROPERTY(name, "t", bus_property_get_usec, (offset) + offsetof(struct dual_timestamp, realtime), (flags)), \
src/shared/conf-parser.c
+1 -2
View File
@@ -515,8 +515,7 @@ int config_parse_many(
#type, rvalue); \ #type, rvalue); \
\ \
return 0; \ return 0; \
} \ }
struct __useless_struct_to_allow_trailing_semicolon__
DEFINE_PARSER(int, int, safe_atoi); DEFINE_PARSER(int, int, safe_atoi);
DEFINE_PARSER(long, long, safe_atoli); DEFINE_PARSER(long, long, safe_atoli);