From a3f8b0ef450d6320cceae2e7d8d92ec919ca1a97 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 1 May 2018 10:44:19 +0900 Subject: [PATCH] nsflags: drop namespace_flag_to_string_many_with_check() We always ignore the unused bits. So, it is not necessary to check them. --- src/core/dbus-execute.c | 2 +- src/shared/nsflags.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index e36a050bdd8..afe7545a0e3 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -1207,7 +1207,7 @@ static BUS_DEFINE_SET_TRANSIENT_PARSE_PTR(personality, unsigned long, parse_pers static BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(secure_bits, "i", int32_t, int, "%" PRIi32, secure_bits_to_string_alloc_with_check); static BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(capability, "t", uint64_t, uint64_t, "%" PRIu64, capability_set_to_string_alloc); static BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(sched_policy, "i", int32_t, int, "%" PRIi32, sched_policy_to_string_alloc_with_check); -static BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(namespace_flag, "t", uint64_t, unsigned long, "%" PRIu64, namespace_flag_to_string_many_with_check); +static BUS_DEFINE_SET_TRANSIENT_TO_STRING_ALLOC(namespace_flag, "t", uint64_t, unsigned long, "%" PRIu64, namespace_flag_to_string_many); static BUS_DEFINE_SET_TRANSIENT_TO_STRING(mount_flags, "t", uint64_t, unsigned long, "%" PRIu64, mount_propagation_flags_to_string_with_check); int bus_exec_context_set_transient_property( diff --git a/src/shared/nsflags.h b/src/shared/nsflags.h index c5bc83e7233..fb4b249d94c 100644 --- a/src/shared/nsflags.h +++ b/src/shared/nsflags.h @@ -29,13 +29,6 @@ unsigned long namespace_flag_from_string(const char *name); int namespace_flag_from_string_many(const char *name, unsigned long *ret); int namespace_flag_to_string_many(unsigned long flags, char **ret); -static inline int namespace_flag_to_string_many_with_check(unsigned long n, char **s) { - if ((n & NAMESPACE_FLAGS_ALL) != n) - return -EINVAL; - - return namespace_flag_to_string_many(n, s); -} - struct namespace_flag_map { unsigned long flag; const char *name; -- 2.47.3