From 56c4076e23b3b0f5d8111efc241ba51441c7b719 Mon Sep 17 00:00:00 2001 From: Andrea Mazzoleni Date: Thu, 23 Jan 2025 15:44:02 +0100 Subject: [PATCH] Avoid a warning about function pointer conversion. No functional changes --- HISTORY | 4 ++ raid/tag.c | 106 +++++++++++++++++++++++++++-------------------------- 2 files changed, 58 insertions(+), 52 deletions(-) diff --git a/HISTORY b/HISTORY index 88a066a5..f225816f 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,10 @@ SnapRAID HISTORY ================ +12.4 2025/01 +============ + * Avoid a warning about function pointer conversion. No functional changes. + 12.3 2024/01 ============ * Fix potential integer overflow when computing the completion percentage. diff --git a/raid/tag.c b/raid/tag.c index bfeefaad..839a8cf3 100644 --- a/raid/tag.c +++ b/raid/tag.c @@ -14,76 +14,78 @@ #include "internal.h" +typedef void (void_f)(void); + static struct raid_func { const char *name; - void (*p)(); + void_f* func; } RAID_FUNC[] = { - { "int8", raid_gen3_int8 }, - { "int8", raid_gen4_int8 }, - { "int8", raid_gen5_int8 }, - { "int8", raid_gen6_int8 }, - { "int32", raid_gen1_int32 }, - { "int64", raid_gen1_int64 }, - { "int32", raid_gen2_int32 }, - { "int64", raid_gen2_int64 }, - { "int32", raid_genz_int32 }, - { "int64", raid_genz_int64 }, - { "int8", raid_rec1_int8 }, - { "int8", raid_rec2_int8 }, - { "int8", raid_recX_int8 }, + { "int8", (void_f*)raid_gen3_int8 }, + { "int8", (void_f*)raid_gen4_int8 }, + { "int8", (void_f*)raid_gen5_int8 }, + { "int8", (void_f*)raid_gen6_int8 }, + { "int32", (void_f*)raid_gen1_int32 }, + { "int64", (void_f*)raid_gen1_int64 }, + { "int32", (void_f*)raid_gen2_int32 }, + { "int64", (void_f*)raid_gen2_int64 }, + { "int32", (void_f*)raid_genz_int32 }, + { "int64", (void_f*)raid_genz_int64 }, + { "int8", (void_f*)raid_rec1_int8 }, + { "int8", (void_f*)raid_rec2_int8 }, + { "int8", (void_f*)raid_recX_int8 }, #ifdef CONFIG_X86 #ifdef CONFIG_SSE2 - { "sse2", raid_gen1_sse2 }, - { "sse2", raid_gen2_sse2 }, - { "sse2", raid_genz_sse2 }, + { "sse2", (void_f*)raid_gen1_sse2 }, + { "sse2", (void_f*)raid_gen2_sse2 }, + { "sse2", (void_f*)raid_genz_sse2 }, #endif #ifdef CONFIG_SSSE3 - { "ssse3", raid_gen3_ssse3 }, - { "ssse3", raid_gen4_ssse3 }, - { "ssse3", raid_gen5_ssse3 }, - { "ssse3", raid_gen6_ssse3 }, - { "ssse3", raid_rec1_ssse3 }, - { "ssse3", raid_rec2_ssse3 }, - { "ssse3", raid_recX_ssse3 }, + { "ssse3", (void_f*)raid_gen3_ssse3 }, + { "ssse3", (void_f*)raid_gen4_ssse3 }, + { "ssse3", (void_f*)raid_gen5_ssse3 }, + { "ssse3", (void_f*)raid_gen6_ssse3 }, + { "ssse3", (void_f*)raid_rec1_ssse3 }, + { "ssse3", (void_f*)raid_rec2_ssse3 }, + { "ssse3", (void_f*)raid_recX_ssse3 }, #endif #ifdef CONFIG_AVX2 - { "avx2", raid_gen1_avx2 }, - { "avx2", raid_gen2_avx2 }, - { "avx2", raid_rec1_avx2 }, - { "avx2", raid_rec2_avx2 }, - { "avx2", raid_recX_avx2 }, + { "avx2", (void_f*)raid_gen1_avx2 }, + { "avx2", (void_f*)raid_gen2_avx2 }, + { "avx2", (void_f*)raid_rec1_avx2 }, + { "avx2", (void_f*)raid_rec2_avx2 }, + { "avx2", (void_f*)raid_recX_avx2 }, #endif #endif #ifdef CONFIG_X86_64 #ifdef CONFIG_SSE2 - { "sse2e", raid_gen2_sse2ext }, - { "sse2e", raid_genz_sse2ext }, + { "sse2e", (void_f*)raid_gen2_sse2ext }, + { "sse2e", (void_f*)raid_genz_sse2ext }, #endif #ifdef CONFIG_SSSE3 - { "ssse3e", raid_gen3_ssse3ext }, - { "ssse3e", raid_gen4_ssse3ext }, - { "ssse3e", raid_gen5_ssse3ext }, - { "ssse3e", raid_gen6_ssse3ext }, + { "ssse3e", (void_f*)raid_gen3_ssse3ext }, + { "ssse3e", (void_f*)raid_gen4_ssse3ext }, + { "ssse3e", (void_f*)raid_gen5_ssse3ext }, + { "ssse3e", (void_f*)raid_gen6_ssse3ext }, #endif #ifdef CONFIG_AVX2 - { "avx2e", raid_gen3_avx2ext }, - { "avx2e", raid_genz_avx2ext }, - { "avx2e", raid_gen4_avx2ext }, - { "avx2e", raid_gen5_avx2ext }, - { "avx2e", raid_gen6_avx2ext }, + { "avx2e", (void_f*)raid_gen3_avx2ext }, + { "avx2e", (void_f*)raid_genz_avx2ext }, + { "avx2e", (void_f*)raid_gen4_avx2ext }, + { "avx2e", (void_f*)raid_gen5_avx2ext }, + { "avx2e", (void_f*)raid_gen6_avx2ext }, #endif #endif { 0, 0 } }; -static const char *raid_tag(void (*func)()) +static const char *raid_tag(void_f* func) { struct raid_func *i = RAID_FUNC; while (i->name != 0) { - if (i->p == func) + if (i->func == func) return i->name; ++i; } @@ -95,51 +97,51 @@ static const char *raid_tag(void (*func)()) const char *raid_gen1_tag(void) { - return raid_tag(raid_gen_ptr[0]); + return raid_tag((void_f*)raid_gen_ptr[0]); } const char *raid_gen2_tag(void) { - return raid_tag(raid_gen_ptr[1]); + return raid_tag((void_f*)raid_gen_ptr[1]); } const char *raid_genz_tag(void) { - return raid_tag(raid_genz_ptr); + return raid_tag((void_f*)raid_genz_ptr); } const char *raid_gen3_tag(void) { - return raid_tag(raid_gen_ptr[2]); + return raid_tag((void_f*)raid_gen_ptr[2]); } const char *raid_gen4_tag(void) { - return raid_tag(raid_gen_ptr[3]); + return raid_tag((void_f*)raid_gen_ptr[3]); } const char *raid_gen5_tag(void) { - return raid_tag(raid_gen_ptr[4]); + return raid_tag((void_f*)raid_gen_ptr[4]); } const char *raid_gen6_tag(void) { - return raid_tag(raid_gen_ptr[5]); + return raid_tag((void_f*)raid_gen_ptr[5]); } const char *raid_rec1_tag(void) { - return raid_tag(raid_rec_ptr[0]); + return raid_tag((void_f*)raid_rec_ptr[0]); } const char *raid_rec2_tag(void) { - return raid_tag(raid_rec_ptr[1]); + return raid_tag((void_f*)raid_rec_ptr[1]); } const char *raid_recX_tag(void) { - return raid_tag(raid_rec_ptr[2]); + return raid_tag((void_f*)raid_rec_ptr[2]); }