From: Zbigniew Jędrzejewski-Szmek Date: Sat, 15 Jul 2023 13:05:43 +0000 (+0200) Subject: sd-device, basic: align backslashes and drop unnecessary parens X-Git-Tag: v255-rc1~912^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9194c1e69727bc87c750e6ec2b2a74996b6f1d5f;p=thirdparty%2Fsystemd.git sd-device, basic: align backslashes and drop unnecessary parens Follow-up for a1af83728f49c0b7487368d54cab90c8c87ac3f6 and 25077313747218f977e72bcd26af19ff477e3a7f. --- diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h index 7a9b0fde7c0..945deb5c661 100644 --- a/src/basic/terminal-util.h +++ b/src/basic/terminal-util.h @@ -185,20 +185,20 @@ static inline const char *ansi_underline(void) { return underline_enabled() ? ANSI_UNDERLINE : ANSI_NORMAL; } -#define DEFINE_ANSI_FUNC_UNDERLINE(name, NAME) \ - static inline const char *ansi_##name(void) { \ - return underline_enabled() ? ANSI_##NAME##_UNDERLINE : \ - colors_enabled() ? ANSI_##NAME : ""; \ +#define DEFINE_ANSI_FUNC_UNDERLINE(name, NAME) \ + static inline const char *ansi_##name(void) { \ + return underline_enabled() ? ANSI_##NAME##_UNDERLINE : \ + colors_enabled() ? ANSI_##NAME : ""; \ } -#define DEFINE_ANSI_FUNC_UNDERLINE_256(name, NAME, FALLBACK) \ - static inline const char *ansi_##name(void) { \ - switch (get_color_mode()) { \ - case COLOR_OFF: return ""; \ +#define DEFINE_ANSI_FUNC_UNDERLINE_256(name, NAME, FALLBACK) \ + static inline const char *ansi_##name(void) { \ + switch (get_color_mode()) { \ + case COLOR_OFF: return ""; \ case COLOR_16: return underline_enabled() ? ANSI_##FALLBACK##_UNDERLINE : ANSI_##FALLBACK; \ default : return underline_enabled() ? ANSI_##NAME##_UNDERLINE: ANSI_##NAME; \ - } \ + } \ } DEFINE_ANSI_FUNC(normal, NORMAL); diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h index 0316a600332..ceb37496ddb 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/sd-device/device-util.h @@ -13,33 +13,33 @@ #define device_unref_and_replace(a, b) \ unref_and_replace_full(a, b, sd_device_ref, sd_device_unref) -#define FOREACH_DEVICE_PROPERTY(device, key, value) \ - for (const char *value, *key = sd_device_get_property_first(device, &(value)); \ - key; \ - key = sd_device_get_property_next(device, &(value))) - -#define FOREACH_DEVICE_TAG(device, tag) \ - for (const char *tag = sd_device_get_tag_first(device); \ - tag; \ +#define FOREACH_DEVICE_PROPERTY(device, key, value) \ + for (const char *value, *key = sd_device_get_property_first(device, &value); \ + key; \ + key = sd_device_get_property_next(device, &value)) + +#define FOREACH_DEVICE_TAG(device, tag) \ + for (const char *tag = sd_device_get_tag_first(device); \ + tag; \ tag = sd_device_get_tag_next(device)) -#define FOREACH_DEVICE_CURRENT_TAG(device, tag) \ +#define FOREACH_DEVICE_CURRENT_TAG(device, tag) \ for (const char *tag = sd_device_get_current_tag_first(device); \ - tag; \ + tag; \ tag = sd_device_get_current_tag_next(device)) -#define FOREACH_DEVICE_SYSATTR(device, attr) \ - for (const char *attr = sd_device_get_sysattr_first(device); \ - attr; \ +#define FOREACH_DEVICE_SYSATTR(device, attr) \ + for (const char *attr = sd_device_get_sysattr_first(device); \ + attr; \ attr = sd_device_get_sysattr_next(device)) -#define FOREACH_DEVICE_DEVLINK(device, devlink) \ +#define FOREACH_DEVICE_DEVLINK(device, devlink) \ for (const char *devlink = sd_device_get_devlink_first(device); \ - devlink; \ + devlink; \ devlink = sd_device_get_devlink_next(device)) #define _FOREACH_DEVICE_CHILD(device, child, suffix_ptr) \ - for (sd_device *child = sd_device_get_child_first(device, suffix_ptr); \ + for (sd_device *child = sd_device_get_child_first(device, suffix_ptr); \ child; \ child = sd_device_get_child_next(device, suffix_ptr)) @@ -49,14 +49,14 @@ #define FOREACH_DEVICE_CHILD_WITH_SUFFIX(device, child, suffix) \ _FOREACH_DEVICE_CHILD(device, child, &suffix) -#define FOREACH_DEVICE(enumerator, device) \ +#define FOREACH_DEVICE(enumerator, device) \ for (sd_device *device = sd_device_enumerator_get_device_first(enumerator); \ - device; \ + device; \ device = sd_device_enumerator_get_device_next(enumerator)) -#define FOREACH_SUBSYSTEM(enumerator, device) \ +#define FOREACH_SUBSYSTEM(enumerator, device) \ for (sd_device *device = sd_device_enumerator_get_subsystem_first(enumerator); \ - device; \ + device; \ device = sd_device_enumerator_get_subsystem_next(enumerator)) #define log_device_full_errno_zerook(device, level, error, ...) \ @@ -81,17 +81,17 @@ #define log_device_full(device, level, ...) (void) log_device_full_errno_zerook(device, level, 0, __VA_ARGS__) -#define log_device_debug(device, ...) log_device_full(device, LOG_DEBUG, __VA_ARGS__) -#define log_device_info(device, ...) log_device_full(device, LOG_INFO, __VA_ARGS__) -#define log_device_notice(device, ...) log_device_full(device, LOG_NOTICE, __VA_ARGS__) +#define log_device_debug(device, ...) log_device_full(device, LOG_DEBUG, __VA_ARGS__) +#define log_device_info(device, ...) log_device_full(device, LOG_INFO, __VA_ARGS__) +#define log_device_notice(device, ...) log_device_full(device, LOG_NOTICE, __VA_ARGS__) #define log_device_warning(device, ...) log_device_full(device, LOG_WARNING, __VA_ARGS__) -#define log_device_error(device, ...) log_device_full(device, LOG_ERR, __VA_ARGS__) +#define log_device_error(device, ...) log_device_full(device, LOG_ERR, __VA_ARGS__) -#define log_device_debug_errno(device, error, ...) log_device_full_errno(device, LOG_DEBUG, error, __VA_ARGS__) -#define log_device_info_errno(device, error, ...) log_device_full_errno(device, LOG_INFO, error, __VA_ARGS__) -#define log_device_notice_errno(device, error, ...) log_device_full_errno(device, LOG_NOTICE, error, __VA_ARGS__) +#define log_device_debug_errno(device, error, ...) log_device_full_errno(device, LOG_DEBUG, error, __VA_ARGS__) +#define log_device_info_errno(device, error, ...) log_device_full_errno(device, LOG_INFO, error, __VA_ARGS__) +#define log_device_notice_errno(device, error, ...) log_device_full_errno(device, LOG_NOTICE, error, __VA_ARGS__) #define log_device_warning_errno(device, error, ...) log_device_full_errno(device, LOG_WARNING, error, __VA_ARGS__) -#define log_device_error_errno(device, error, ...) log_device_full_errno(device, LOG_ERR, error, __VA_ARGS__) +#define log_device_error_errno(device, error, ...) log_device_full_errno(device, LOG_ERR, error, __VA_ARGS__) int devname_from_devnum(mode_t mode, dev_t devnum, char **ret); static inline int devname_from_stat_rdev(const struct stat *st, char **ret) {