kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=59561dcb1b172ba87fa1ab6b71833bb4594103e7
commit 59561dcb1b172ba87fa1ab6b71833bb4594103e7 Author: Kim Woelders <[email protected]> Date: Thu Nov 4 19:34:40 2021 +0100 Introduce ARRAY_SIZE() --- src/lib/common.h | 2 ++ src/modules/filters/filter_bumpmap.c | 2 +- src/modules/filters/filter_colormod.c | 2 +- src/modules/loaders/loader_argb.c | 3 +-- src/modules/loaders/loader_bmp.c | 3 +-- src/modules/loaders/loader_bz2.c | 3 +-- src/modules/loaders/loader_ff.c | 3 +-- src/modules/loaders/loader_gif.c | 3 +-- src/modules/loaders/loader_ico.c | 3 +-- src/modules/loaders/loader_id3.c | 7 +++---- src/modules/loaders/loader_jpeg.c | 3 +-- src/modules/loaders/loader_lbm.c | 3 +-- src/modules/loaders/loader_png.c | 3 +-- src/modules/loaders/loader_pnm.c | 3 +-- src/modules/loaders/loader_tga.c | 3 +-- src/modules/loaders/loader_tiff.c | 3 +-- src/modules/loaders/loader_webp.c | 3 +-- src/modules/loaders/loader_xbm.c | 3 +-- src/modules/loaders/loader_xpm.c | 3 +-- src/modules/loaders/loader_zlib.c | 3 +-- 20 files changed, 23 insertions(+), 38 deletions(-) diff --git a/src/lib/common.h b/src/lib/common.h index 3b5ec76..7dcbc92 100644 --- a/src/lib/common.h +++ b/src/lib/common.h @@ -18,6 +18,8 @@ #define __PRINTF__ __PRINTF_N__(1) #define __PRINTF_2__ __PRINTF_N__(2) +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) + #define DATABIG unsigned long long #define DATA64 unsigned long long #define DATA32 unsigned int diff --git a/src/modules/filters/filter_bumpmap.c b/src/modules/filters/filter_bumpmap.c index 3c4c71c..21598ef 100644 --- a/src/modules/filters/filter_bumpmap.c +++ b/src/modules/filters/filter_bumpmap.c @@ -247,7 +247,7 @@ void init(struct imlib_filter_info *info) { static const char *const filters[] = { "bump_map_point", "bump_map" }; - int i = (sizeof(filters) / sizeof(*filters)); + int i = ARRAY_SIZE(filters); info->name = strdup("Bump Mapping"); info->author = strdup("Willem Monsuwe ([email protected])"); diff --git a/src/modules/filters/filter_colormod.c b/src/modules/filters/filter_colormod.c index 65c7ae8..ebd55f4 100644 --- a/src/modules/filters/filter_colormod.c +++ b/src/modules/filters/filter_colormod.c @@ -228,7 +228,7 @@ void init(struct imlib_filter_info *info) { static const char *const filters[] = { "colormod" }; - int i = (sizeof(filters) / sizeof(*filters)); + int i = ARRAY_SIZE(filters); info->name = strdup("Tinting"); info->author = strdup("Willem Monsuwe ([email protected])"); diff --git a/src/modules/loaders/loader_argb.c b/src/modules/loaders/loader_argb.c index fb326d9..93d1be1 100644 --- a/src/modules/loaders/loader_argb.c +++ b/src/modules/loaders/loader_argb.c @@ -177,6 +177,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "argb", "arg" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_bmp.c b/src/modules/loaders/loader_bmp.c index 8f6f2ee..21e07a0 100644 --- a/src/modules/loaders/loader_bmp.c +++ b/src/modules/loaders/loader_bmp.c @@ -849,6 +849,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "bmp" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_bz2.c b/src/modules/loaders/loader_bz2.c index 66da442..4146909 100644 --- a/src/modules/loaders/loader_bz2.c +++ b/src/modules/loaders/loader_bz2.c @@ -91,6 +91,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "bz2" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_ff.c b/src/modules/loaders/loader_ff.c index 6a85194..a69165e 100644 --- a/src/modules/loaders/loader_ff.c +++ b/src/modules/loaders/loader_ff.c @@ -164,6 +164,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "ff" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c index 7002417..de3b921 100644 --- a/src/modules/loaders/loader_gif.c +++ b/src/modules/loaders/loader_gif.c @@ -179,6 +179,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "gif" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c index dd48acb..8dce7ff 100644 --- a/src/modules/loaders/loader_ico.c +++ b/src/modules/loaders/loader_ico.c @@ -470,6 +470,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "ico" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_id3.c b/src/modules/loaders/loader_id3.c index 40e172c..5fe4498 100644 --- a/src/modules/loaders/loader_id3.c +++ b/src/modules/loaders/loader_id3.c @@ -416,7 +416,7 @@ static const char *const id3_pic_types[] = { }; #define NUM_OF_ID3_PIC_TYPES \ - (sizeof(id3_pic_types) / sizeof(id3_pic_types[0])) + (ARRAY_SIZE(id3_pic_types)) static const char *const id3_text_encodings[] = { /* $00 */ "ISO-8859-1", @@ -426,7 +426,7 @@ static const char *const id3_text_encodings[] = { }; #define NUM_OF_ID3_TEXT_ENCODINGS \ - (sizeof(id3_text_encodings) / sizeof(id3_text_encodings[0])) + (ARRAY_SIZE(id3_text_encodings)) static void write_tags(ImlibImage * im, lopt * opt) @@ -599,6 +599,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "mp3" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_jpeg.c b/src/modules/loaders/loader_jpeg.c index 831d6ca..1316408 100644 --- a/src/modules/loaders/loader_jpeg.c +++ b/src/modules/loaders/loader_jpeg.c @@ -366,6 +366,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "jpg", "jpeg", "jfif", "jfi" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_lbm.c b/src/modules/loaders/loader_lbm.c index ae96d38..5e49335 100644 --- a/src/modules/loaders/loader_lbm.c +++ b/src/modules/loaders/loader_lbm.c @@ -600,6 +600,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "iff", "ilbm", "lbm" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_png.c b/src/modules/loaders/loader_png.c index de9d103..deb1533 100644 --- a/src/modules/loaders/loader_png.c +++ b/src/modules/loaders/loader_png.c @@ -366,6 +366,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "png" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_pnm.c b/src/modules/loaders/loader_pnm.c index 8dab889..d0b9630 100644 --- a/src/modules/loaders/loader_pnm.c +++ b/src/modules/loaders/loader_pnm.c @@ -545,6 +545,5 @@ formats(ImlibLoader * l) { static const char *const list_formats[] = { "pnm", "ppm", "pgm", "pbm", "pam" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_tga.c b/src/modules/loaders/loader_tga.c index c74d17f..eab9a3c 100644 --- a/src/modules/loaders/loader_tga.c +++ b/src/modules/loaders/loader_tga.c @@ -575,8 +575,7 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "tga" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } /**********************/ diff --git a/src/modules/loaders/loader_tiff.c b/src/modules/loaders/loader_tiff.c index 0b25ca0..a2d06c6 100644 --- a/src/modules/loaders/loader_tiff.c +++ b/src/modules/loaders/loader_tiff.c @@ -511,6 +511,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "tiff", "tif" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_webp.c b/src/modules/loaders/loader_webp.c index d8a0b30..bf9d515 100644 --- a/src/modules/loaders/loader_webp.c +++ b/src/modules/loaders/loader_webp.c @@ -149,6 +149,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "webp" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_xbm.c b/src/modules/loaders/loader_xbm.c index 0963384..22f4832 100644 --- a/src/modules/loaders/loader_xbm.c +++ b/src/modules/loaders/loader_xbm.c @@ -283,6 +283,5 @@ formats(ImlibLoader * l) { static const char *const list_formats[] = { "xbm" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_xpm.c b/src/modules/loaders/loader_xpm.c index ccadf7b..e275b73 100644 --- a/src/modules/loaders/loader_xpm.c +++ b/src/modules/loaders/loader_xpm.c @@ -487,6 +487,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "xpm" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } diff --git a/src/modules/loaders/loader_zlib.c b/src/modules/loaders/loader_zlib.c index a007f95..306f262 100644 --- a/src/modules/loaders/loader_zlib.c +++ b/src/modules/loaders/loader_zlib.c @@ -84,6 +84,5 @@ void formats(ImlibLoader * l) { static const char *const list_formats[] = { "gz" }; - __imlib_LoaderSetFormats(l, list_formats, - sizeof(list_formats) / sizeof(char *)); + __imlib_LoaderSetFormats(l, list_formats, ARRAY_SIZE(list_formats)); } --
