libkmod: use C99 __func__ over GNU-specific __FUNCTION__

diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c
index 0eeb8169990782eb41fd7a635e3d86d9357fe0c3..bc99ddc944594d0afac500c9440987f433528c83 100644 (file)
--- a/libkmod/libkmod-elf.c
+++ b/libkmod/libkmod-elf.c
@@ -64,7 +64,7 @@ struct kmod_elf {
 
 #if defined(ENABLE_LOGGING) && defined(ENABLE_ELFDBG)
 #define ELFDBG(elf, ...)                       \
-       _elf_dbg(elf, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__);
+       _elf_dbg(elf, __FILE__, __LINE__, __func__, __VA_ARGS__);
 
 static inline void _elf_dbg(const struct kmod_elf *elf, const char *fname, unsigned line, const char *func, const char *fmt, ...)
 {

diff --git a/libkmod/libkmod-private.h b/libkmod/libkmod-private.h
index 833717239d5d9eacd7825ebc942521e3f0b6c358..4b0d84f6a3e38c4c51692b2c65909ed57f71950f 100644 (file)
--- a/libkmod/libkmod-private.h
+++ b/libkmod/libkmod-private.h
@@ -15,7 +15,7 @@ static __always_inline __printf_format(2, 3) void
 #define kmod_log_cond(ctx, prio, arg...) \
        do { \
                if (kmod_get_log_priority(ctx) >= prio) \
-               kmod_log(ctx, prio, __FILE__, __LINE__, __FUNCTION__, ## arg);\
+               kmod_log(ctx, prio, __FILE__, __LINE__, __func__, ## arg);\
        } while (0)
 
 #ifdef ENABLE_LOGGING