SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8372 from keszybz/two-cleanups

Browse Source 
Two cleanups
This commit is contained in:
Lennart Poettering
2018-03-08 23:23:43 +01:00
committed by GitHub
parent 5cbaad2f67 f6a8265b9a
commit 586fb20fd1
9 changed files with 21 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define DEFINE_BUS_APPEND_PARSE(bus_type, 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 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
DEFINE_BUS_APPEND_PARSE("b", parse_boolean);
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 1; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
#define BUS_PROPERTY_DUAL_TIMESTAMP(name, offset, 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); \
\
return 0; \
} \
struct __useless_struct_to_allow_trailing_semicolon__
}
DEFINE_PARSER(int, int, safe_atoi);
DEFINE_PARSER(long, long, safe_atoli);