From 67aef9bbf3b5d18c70e8c4a45734bcb6d6744a8c Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Tue, 3 Mar 2020 13:14:30 +0100 Subject: [PATCH] Consolidate `ALIGN, __ALIGN_MASK, ARRAY_SIZE` macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate `ALIGN, __ALIGN_MASK, ARRAY_SIZE` macros and add them to lib/zt_common.h. While at it, adapt coding style. Reviewed-by: Philipp Rudo Reviewed-by: Stefan Haberland Signed-off-by: Marc Hartmayer Signed-off-by: Jan Höppner --- cmsfs-fuse/dasd.c | 1 + cmsfs-fuse/helper.h | 2 -- include/lib/zt_common.h | 4 ++++ zconf/qeth/misc.h | 2 -- zdev/include/misc.h | 2 +- zdump/zg.c | 2 +- zdump/zg.h | 3 --- zipl/include/zipl.h | 4 ---- 8 files changed, 7 insertions(+), 13 deletions(-) diff --git a/cmsfs-fuse/dasd.c b/cmsfs-fuse/dasd.c index 33bbfc7a..16c22656 100644 --- a/cmsfs-fuse/dasd.c +++ b/cmsfs-fuse/dasd.c @@ -19,6 +19,7 @@ #include #include +#include "lib/zt_common.h" #include "cmsfs-fuse.h" #include "edf.h" #include "helper.h" diff --git a/cmsfs-fuse/helper.h b/cmsfs-fuse/helper.h index e44f76e7..0787f59c 100644 --- a/cmsfs-fuse/helper.h +++ b/cmsfs-fuse/helper.h @@ -49,6 +49,4 @@ extern FILE *logfile; fprintf(stderr, COMP "Warning, " __VA_ARGS__); \ } while (0) -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - #endif diff --git a/include/lib/zt_common.h b/include/lib/zt_common.h index 5269e0ed..8f4f1641 100644 --- a/include/lib/zt_common.h +++ b/include/lib/zt_common.h @@ -44,6 +44,10 @@ # define STATIC_ASSERT(test) #endif +#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + #define RELEASE_STRING STRINGIFY (S390_TOOLS_RELEASE) #define TOOLS_LIBDIR STRINGIFY (S390_TOOLS_LIBDIR) #define TOOLS_SYSCONFDIR STRINGIFY (S390_TOOLS_SYSCONFDIR) diff --git a/zconf/qeth/misc.h b/zconf/qeth/misc.h index d9df17ac..3f433272 100644 --- a/zconf/qeth/misc.h +++ b/zconf/qeth/misc.h @@ -12,8 +12,6 @@ #include -#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) - char *misc_link_target(const char *fmt, ...); bool misc_str_in_list(const char *str, const char *strings[], int array_size); int misc_argz_add_from_file(char **argz, size_t *argz_len, diff --git a/zdev/include/misc.h b/zdev/include/misc.h index 43deb6cc..af8f5889 100644 --- a/zdev/include/misc.h +++ b/zdev/include/misc.h @@ -15,10 +15,10 @@ #include #include +#include "lib/zt_common.h" #include "lib/util_list.h" #include "exit_code.h" -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define SCOPE_ACTIVE(x) ((x) & config_active ? 1 : 0) #define SCOPE_PERSISTENT(x) ((x) & config_persistent ? 1 : 0) #define SCOPE_AUTOCONF(x) ((x) & config_autoconf ? 1 : 0) diff --git a/zdump/zg.c b/zdump/zg.c index 869c3615..378cbf9b 100644 --- a/zdump/zg.c +++ b/zdump/zg.c @@ -432,7 +432,7 @@ char *zg_devnode_create(dev_t dev) char *file_path; unsigned int i; - for (i = 0; i < ARRAY_ELEMENT_CNT(dir_vec); i++) { + for (i = 0; i < ARRAY_SIZE(dir_vec); i++) { if (dir_vec[i] == NULL) continue; file_path = devnode_create_dir(dir_vec[i], dev); diff --git a/zdump/zg.h b/zdump/zg.h index b97a3d3c..efde05bc 100644 --- a/zdump/zg.h +++ b/zdump/zg.h @@ -122,10 +122,7 @@ do { \ * Misc */ #define PAGE_SIZE 4096UL -#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) -#define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) -#define ARRAY_ELEMENT_CNT(x) (sizeof(x) / sizeof(x[0])) #define ROUNDUP(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) static inline u32 zg_csum_partial(const void *buf, int len, u32 sum) diff --git a/zipl/include/zipl.h b/zipl/include/zipl.h index 3ae895b1..2465010b 100644 --- a/zipl/include/zipl.h +++ b/zipl/include/zipl.h @@ -64,10 +64,6 @@ typedef uint64_t address_t; * resulting return code or 0. */ #define DRY_RUN_FUNC(x) (dry_run ? 0 : (x)) -#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) -#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) -#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) - extern int verbose; extern int interactive; extern int dry_run;