logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0004-Use-__func__-instead-of-obsolete-and-non-standard-__.patch (24742B)

    

  1. From c2214f16d6ae769ddbcbd106cc1059e3304ce2d9 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sat, 21 Jan 2023 17:12:32 -0800
  4. Subject: [PATCH] Use __func__ instead of obsolete and non-standard
  5.  __FUNCTION__
  7. ---
  8.  include/os/freebsd/spl/sys/debug.h   | 32 +++++++++++++-------------
  9.  include/os/linux/spl/sys/debug.h     | 32 +++++++++++++-------------
  10.  lib/libspl/include/assert.h          | 34 ++++++++++++++--------------
  11.  module/os/freebsd/zfs/crypto_os.c    |  8 +++----
  12.  module/os/freebsd/zfs/zfs_vnops_os.c |  2 +-
  13.  module/os/freebsd/zfs/zio_crypt.c    |  6 ++---
  14.  tests/zfs-tests/cmd/idmap_util.c     |  2 +-
  15.  7 files changed, 58 insertions(+), 58 deletions(-)
  17. diff --git a/include/os/freebsd/spl/sys/debug.h b/include/os/freebsd/spl/sys/debug.h
  18. index 32bc02f3d..2bd7eec25 100644
  19. --- a/include/os/freebsd/spl/sys/debug.h
  20. +++ b/include/os/freebsd/spl/sys/debug.h
  21. @@ -102,16 +102,16 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  22.  #endif
  23.  
  24.  #define	PANIC(fmt, a...)						\
  25. -	spl_panic(__FILE__, __FUNCTION__, __LINE__, fmt, ## a)
  26. +	spl_panic(__FILE__, __func__, __LINE__, fmt, ## a)
  27.  
  28.  #define	VERIFY(cond)							\
  29.  	(void) (unlikely(!(cond)) &&					\
  30.  	    spl_assert("VERIFY(" #cond ") failed\n",			\
  31. -	    __FILE__, __FUNCTION__, __LINE__))
  32. +	    __FILE__, __func__, __LINE__))
  33.  
  34.  #define	VERIFYF(cond, str, ...)		do {				\
  35.  		if (unlikely(!(cond)))					\
  36. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  37. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  38.  		    "VERIFY(" #cond ") failed " str "\n", __VA_ARGS__);\
  39.  	} while (0)
  40.  
  41. @@ -119,7 +119,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  42.  		const boolean_t _verify3_left = (boolean_t)!!(LEFT);	\
  43.  		const boolean_t _verify3_right = (boolean_t)!!(RIGHT);	\
  44.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  45. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  46. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  47.  		    "VERIFY3B(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  48.  		    "failed (%d " #OP " %d)\n",				\
  49.  		    _verify3_left, _verify3_right);			\
  50. @@ -129,7 +129,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  51.  		const int64_t _verify3_left = (int64_t)(LEFT);		\
  52.  		const int64_t _verify3_right = (int64_t)(RIGHT);	\
  53.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  54. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  55. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  56.  		    "VERIFY3S(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  57.  		    "failed (%lld " #OP " %lld)\n",			\
  58.  		    (long long)_verify3_left,				\
  59. @@ -140,7 +140,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  60.  		const uint64_t _verify3_left = (uint64_t)(LEFT);	\
  61.  		const uint64_t _verify3_right = (uint64_t)(RIGHT);	\
  62.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  63. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  64. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  65.  		    "VERIFY3U(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  66.  		    "failed (%llu " #OP " %llu)\n",			\
  67.  		    (unsigned long long)_verify3_left,			\
  68. @@ -151,7 +151,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  69.  		const uintptr_t _verify3_left = (uintptr_t)(LEFT);	\
  70.  		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);	\
  71.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  72. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  73. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  74.  		    "VERIFY3P(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  75.  		    "failed (%p " #OP " %p)\n",				\
  76.  		    (void *)_verify3_left,				\
  77. @@ -161,7 +161,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  78.  #define	VERIFY0(RIGHT)	do {						\
  79.  		const int64_t _verify0_right = (int64_t)(RIGHT);	\
  80.  		if (unlikely(!(0 == _verify0_right)))			\
  81. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  82. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  83.  		    "VERIFY0(" #RIGHT ") failed (%lld)\n",		\
  84.  		    (long long)_verify0_right);				\
  85.  	} while (0)
  86. @@ -169,7 +169,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  87.  #define	VERIFY0P(RIGHT)	do {						\
  88.  		const uintptr_t _verify0_right = (uintptr_t)(RIGHT);	\
  89.  		if (unlikely(!(0 == _verify0_right)))			\
  90. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  91. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  92.  		    "VERIFY0P(" #RIGHT ") failed (%p)\n",		\
  93.  		    (void *)_verify0_right);				\
  94.  	} while (0)
  95. @@ -186,7 +186,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  96.  		const boolean_t _verify3_left = (boolean_t)!!(LEFT);	\
  97.  		const boolean_t _verify3_right = (boolean_t)!!(RIGHT);	\
  98.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  99. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  100. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  101.  		    "VERIFY3B(" #LEFT ", " #OP ", "  #RIGHT ") "	\
  102.  		    "failed (%d " #OP " %d) " STR "\n",			\
  103.  		    _verify3_left, _verify3_right,			\
  104. @@ -197,7 +197,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  105.  		const int64_t _verify3_left = (int64_t)(LEFT);		\
  106.  		const int64_t _verify3_right = (int64_t)(RIGHT);	\
  107.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  108. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  109. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  110.  		    "VERIFY3S(" #LEFT ", " #OP ", "  #RIGHT ") "	\
  111.  		    "failed (%lld " #OP " %lld) " STR "\n",		\
  112.  		    (long long)_verify3_left, (long long)_verify3_right,\
  113. @@ -208,7 +208,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  114.  		const uint64_t _verify3_left = (uint64_t)(LEFT);	\
  115.  		const uint64_t _verify3_right = (uint64_t)(RIGHT);	\
  116.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  117. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  118. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  119.  		    "VERIFY3U(" #LEFT ", " #OP ", "  #RIGHT ") "	\
  120.  		    "failed (%llu " #OP " %llu) " STR "\n",		\
  121.  		    (unsigned long long)_verify3_left,			\
  122. @@ -220,7 +220,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  123.  		const uintptr_t _verify3_left = (uintptr_t)(LEFT);	\
  124.  		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);	\
  125.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  126. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  127. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  128.  		    "VERIFY3P(" #LEFT ", " #OP ", "  #RIGHT ") "	\
  129.  		    "failed (%p " #OP " %p) " STR "\n",			\
  130.  		    (void *)_verify3_left, (void *)_verify3_right,	\
  131. @@ -230,7 +230,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  132.  #define	VERIFY0PF(RIGHT, STR, ...)	do {				\
  133.  		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);	\
  134.  		if (unlikely(!(0 == _verify3_right)))			\
  135. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  136. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  137.  		    "VERIFY0P(" #RIGHT ") failed (%p) " STR "\n",	\
  138.  		    (void *)_verify3_right,				\
  139.  		    __VA_ARGS__);					\
  140. @@ -239,7 +239,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  141.  #define	VERIFY0F(RIGHT, STR, ...)	do {				\
  142.  		const int64_t _verify3_right = (int64_t)(RIGHT);	\
  143.  		if (unlikely(!(0 == _verify3_right)))			\
  144. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  145. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  146.  		    "VERIFY0(" #RIGHT ") failed (%lld) " STR "\n",	\
  147.  		    (long long)_verify3_right,				\
  148.  		    __VA_ARGS__);					\
  149. @@ -248,7 +248,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  150.  #define	VERIFY_IMPLY(A, B) \
  151.  	((void)(likely((!(A)) || (B)) ||				\
  152.  	    spl_assert("(" #A ") implies (" #B ")",			\
  153. -	    __FILE__, __FUNCTION__, __LINE__)))
  154. +	    __FILE__, __func__, __LINE__)))
  155.  
  156.  #define	VERIFY_EQUIV(A, B)	VERIFY3B(A, ==, B)
  157.  
  158. diff --git a/include/os/linux/spl/sys/debug.h b/include/os/linux/spl/sys/debug.h
  159. index 85b96e1e2..40c8bb506 100644
  160. --- a/include/os/linux/spl/sys/debug.h
  161. +++ b/include/os/linux/spl/sys/debug.h
  162. @@ -106,16 +106,16 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  163.  #endif
  164.  
  165.  #define	PANIC(fmt, a...)						\
  166. -	spl_panic(__FILE__, __FUNCTION__, __LINE__, fmt, ## a)
  167. +	spl_panic(__FILE__, __func__, __LINE__, fmt, ## a)
  168.  
  169.  #define	VERIFY(cond)							\
  170.  	(void) (unlikely(!(cond)) &&					\
  171.  	    spl_assert("VERIFY(" #cond ") failed\n",			\
  172. -	    __FILE__, __FUNCTION__, __LINE__))
  173. +	    __FILE__, __func__, __LINE__))
  174.  
  175.  #define	VERIFYF(cond, str, ...)		do {				\
  176.  		if (unlikely(!(cond)))					\
  177. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  178. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  179.  		    "VERIFY(" #cond ") failed " str "\n", __VA_ARGS__);\
  180.  	} while (0)
  181.  
  182. @@ -123,7 +123,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  183.  		const boolean_t _verify3_left = (boolean_t)!!(LEFT);	\
  184.  		const boolean_t _verify3_right = (boolean_t)!!(RIGHT);	\
  185.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  186. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  187. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  188.  		    "VERIFY3B(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  189.  		    "failed (%d " #OP " %d)\n",				\
  190.  		    _verify3_left, _verify3_right);			\
  191. @@ -133,7 +133,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  192.  		const int64_t _verify3_left = (int64_t)(LEFT);		\
  193.  		const int64_t _verify3_right = (int64_t)(RIGHT);	\
  194.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  195. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  196. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  197.  		    "VERIFY3S(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  198.  		    "failed (%lld " #OP " %lld)\n",			\
  199.  		    (long long)_verify3_left,				\
  200. @@ -144,7 +144,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  201.  		const uint64_t _verify3_left = (uint64_t)(LEFT);	\
  202.  		const uint64_t _verify3_right = (uint64_t)(RIGHT);	\
  203.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  204. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  205. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  206.  		    "VERIFY3U(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  207.  		    "failed (%llu " #OP " %llu)\n",			\
  208.  		    (unsigned long long)_verify3_left,			\
  209. @@ -155,7 +155,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  210.  		const uintptr_t _verify3_left = (uintptr_t)(LEFT);	\
  211.  		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);	\
  212.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  213. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  214. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  215.  		    "VERIFY3P(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  216.  		    "failed (%px " #OP " %px)\n",			\
  217.  		    (void *)_verify3_left,				\
  218. @@ -165,7 +165,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  219.  #define	VERIFY0(RIGHT)	do {						\
  220.  		const int64_t _verify0_right = (int64_t)(RIGHT);	\
  221.  		if (unlikely(!(0 == _verify0_right)))			\
  222. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  223. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  224.  		    "VERIFY0(" #RIGHT ") failed (%lld)\n",		\
  225.  		    (long long)_verify0_right);				\
  226.  	} while (0)
  227. @@ -173,7 +173,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  228.  #define	VERIFY0P(RIGHT)	do {						\
  229.  		const uintptr_t _verify0_right = (uintptr_t)(RIGHT);	\
  230.  		if (unlikely(!(0 == _verify0_right)))			\
  231. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  232. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  233.  		    "VERIFY0P(" #RIGHT ") failed (%px)\n",		\
  234.  		    (void *)_verify0_right);				\
  235.  	} while (0)
  236. @@ -190,7 +190,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  237.  		const boolean_t _verify3_left = (boolean_t)!!(LEFT);	\
  238.  		const boolean_t _verify3_right = (boolean_t)!!(RIGHT);	\
  239.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  240. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  241. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  242.  		    "VERIFY3B(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  243.  		    "failed (%d " #OP " %d) " STR "\n",			\
  244.  		    _verify3_left, _verify3_right,			\
  245. @@ -201,7 +201,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  246.  		const int64_t _verify3_left = (int64_t)(LEFT);		\
  247.  		const int64_t _verify3_right = (int64_t)(RIGHT);	\
  248.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  249. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  250. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  251.  		    "VERIFY3S(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  252.  		    "failed (%lld " #OP " %lld) " STR "\n",		\
  253.  		    (long long)_verify3_left, (long long)_verify3_right,\
  254. @@ -212,7 +212,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  255.  		const uint64_t _verify3_left = (uint64_t)(LEFT);	\
  256.  		const uint64_t _verify3_right = (uint64_t)(RIGHT);	\
  257.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  258. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  259. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  260.  		    "VERIFY3U(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  261.  		    "failed (%llu " #OP " %llu) " STR "\n",		\
  262.  		    (unsigned long long)_verify3_left,			\
  263. @@ -224,7 +224,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  264.  		const uintptr_t _verify3_left = (uintptr_t)(LEFT);	\
  265.  		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);	\
  266.  		if (unlikely(!(_verify3_left OP _verify3_right)))	\
  267. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  268. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  269.  		    "VERIFY3P(" #LEFT ", "  #OP ", "  #RIGHT ") "	\
  270.  		    "failed (%px " #OP " %px) " STR "\n",		\
  271.  		    (void *)_verify3_left, (void *)_verify3_right,	\
  272. @@ -234,7 +234,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  273.  #define	VERIFY0PF(RIGHT, STR, ...)	do {				\
  274.  		const uintptr_t _verify3_right = (uintptr_t)(RIGHT);	\
  275.  		if (unlikely(!(0 == _verify3_right)))			\
  276. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  277. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  278.  		    "VERIFY0P(" #RIGHT ") failed (%px) " STR "\n",	\
  279.  		    (void *)_verify3_right,				\
  280.  		    __VA_ARGS__);					\
  281. @@ -243,7 +243,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  282.  #define	VERIFY0F(RIGHT, STR, ...)	do {				\
  283.  		const int64_t _verify3_right = (int64_t)(RIGHT);	\
  284.  		if (unlikely(!(0 == _verify3_right)))			\
  285. -		    spl_panic(__FILE__, __FUNCTION__, __LINE__,		\
  286. +		    spl_panic(__FILE__, __func__, __LINE__,		\
  287.  		    "VERIFY0(" #RIGHT ") failed (%lld) " STR "\n",	\
  288.  		    (long long)_verify3_right,				\
  289.  		    __VA_ARGS__);					\
  290. @@ -252,7 +252,7 @@ spl_assert(const char *buf, const char *file, const char *func, int line)
  291.  #define	VERIFY_IMPLY(A, B) \
  292.  	((void)(likely((!(A)) || (B)) ||				\
  293.  	    spl_assert("(" #A ") implies (" #B ")",			\
  294. -	    __FILE__, __FUNCTION__, __LINE__)))
  295. +	    __FILE__, __func__, __LINE__)))
  296.  
  297.  #define	VERIFY_EQUIV(A, B)	VERIFY3B(A, ==, B)
  298.  
  299. diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
  300. index e704a899e..da0838766 100644
  301. --- a/lib/libspl/include/assert.h
  302. +++ b/lib/libspl/include/assert.h
  303. @@ -66,30 +66,30 @@ libspl_assert(const char *buf, const char *file, const char *func, int line)
  304.  #endif
  305.  
  306.  #define	PANIC(fmt, a...)						\
  307. -	libspl_assertf(__FILE__, __FUNCTION__, __LINE__, fmt, ## a)
  308. +	libspl_assertf(__FILE__, __func__, __LINE__, fmt, ## a)
  309.  
  310.  #define	VERIFY(cond)							\
  311.  	(void) ((!(cond)) &&						\
  312. -	    libspl_assert(#cond, __FILE__, __FUNCTION__, __LINE__))
  313. +	    libspl_assert(#cond, __FILE__, __func__, __LINE__))
  314.  
  315.  #define	VERIFYF(cond, STR, ...)						\
  316.  do {									\
  317.  	if (!(cond))							\
  318. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  319. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  320.  		    "%s " STR, #cond,					\
  321.  		    __VA_ARGS__);					\
  322.  } while (0)
  323.  
  324.  #define	verify(cond)							\
  325.  	(void) ((!(cond)) &&						\
  326. -	    libspl_assert(#cond, __FILE__, __FUNCTION__, __LINE__))
  327. +	    libspl_assert(#cond, __FILE__, __func__, __LINE__))
  328.  
  329.  #define	VERIFY3B(LEFT, OP, RIGHT)					\
  330.  do {									\
  331.  	const boolean_t __left = (boolean_t)!!(LEFT);			\
  332.  	const boolean_t __right = (boolean_t)!!(RIGHT);			\
  333.  	if (!(__left OP __right))					\
  334. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  335. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  336.  		    "VERIFY3B(%s, %s, %s) failed "			\
  337.  		    "(%d %s %d)", #LEFT, #OP, #RIGHT,			\
  338.  		    __left, #OP, __right);				\
  339. @@ -100,7 +100,7 @@ do {									\
  340.  	const int64_t __left = (int64_t)(LEFT);				\
  341.  	const int64_t __right = (int64_t)(RIGHT);			\
  342.  	if (!(__left OP __right))					\
  343. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  344. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  345.  		    "VERIFY3S(%s, %s, %s) failed "			\
  346.  		    "(%lld %s 0x%lld)", #LEFT, #OP, #RIGHT,		\
  347.  		    (longlong_t)__left, #OP, (longlong_t)__right);	\
  348. @@ -111,7 +111,7 @@ do {									\
  349.  	const uint64_t __left = (uint64_t)(LEFT);			\
  350.  	const uint64_t __right = (uint64_t)(RIGHT);			\
  351.  	if (!(__left OP __right))					\
  352. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  353. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  354.  		    "VERIFY3U(%s, %s, %s) failed "			\
  355.  		    "(%llu %s %llu)", #LEFT, #OP, #RIGHT,		\
  356.  		    (u_longlong_t)__left, #OP, (u_longlong_t)__right);	\
  357. @@ -122,7 +122,7 @@ do {									\
  358.  	const uintptr_t __left = (uintptr_t)(LEFT);			\
  359.  	const uintptr_t __right = (uintptr_t)(RIGHT);			\
  360.  	if (!(__left OP __right))					\
  361. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  362. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  363.  		    "VERIFY3P(%s, %s, %s) failed "			\
  364.  		    "(%p %s %p)", #LEFT, #OP, #RIGHT,			\
  365.  		    (void *)__left, #OP, (void *)__right);		\
  366. @@ -132,7 +132,7 @@ do {									\
  367.  do {									\
  368.  	const uint64_t __left = (uint64_t)(LEFT);			\
  369.  	if (!(__left == 0))						\
  370. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  371. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  372.  		    "VERIFY0(%s) failed (%lld)", #LEFT,			\
  373.  		    (u_longlong_t)__left);				\
  374.  } while (0)
  375. @@ -141,7 +141,7 @@ do {									\
  376.  do {									\
  377.  	const uintptr_t __left = (uintptr_t)(LEFT);			\
  378.  	if (!(__left == 0))						\
  379. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  380. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  381.  		    "VERIFY0P(%s) failed (%p)", #LEFT,			\
  382.  		    (void *)__left);					\
  383.  } while (0)
  384. @@ -157,7 +157,7 @@ do {									\
  385.  	const boolean_t __left = (boolean_t)!!(LEFT);			\
  386.  	const boolean_t __right = (boolean_t)!!(RIGHT);			\
  387.  	if (!(__left OP __right))					\
  388. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  389. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  390.  		    "VERIFY3B(%s, %s, %s) failed "			\
  391.  		    "(%d %s %d) " STR, #LEFT, #OP, #RIGHT,		\
  392.  		    __left, #OP, __right,				\
  393. @@ -169,7 +169,7 @@ do {									\
  394.  	const int64_t __left = (int64_t)(LEFT);				\
  395.  	const int64_t __right = (int64_t)(RIGHT);			\
  396.  	if (!(__left OP __right))					\
  397. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  398. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  399.  		    "VERIFY3S(%s, %s, %s) failed "			\
  400.  		    "(%lld %s %lld) " STR, #LEFT, #OP, #RIGHT,		\
  401.  		    (longlong_t)__left, #OP, (longlong_t)__right,	\
  402. @@ -181,7 +181,7 @@ do {									\
  403.  	const uint64_t __left = (uint64_t)(LEFT);			\
  404.  	const uint64_t __right = (uint64_t)(RIGHT);			\
  405.  	if (!(__left OP __right))					\
  406. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  407. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  408.  		    "VERIFY3U(%s, %s, %s) failed "			\
  409.  		    "(%llu %s %llu) " STR, #LEFT, #OP, #RIGHT,		\
  410.  		    (u_longlong_t)__left, #OP, (u_longlong_t)__right,	\
  411. @@ -193,7 +193,7 @@ do {									\
  412.  	const uintptr_t __left = (uintptr_t)(LEFT);			\
  413.  	const uintptr_t __right = (uintptr_t)(RIGHT);			\
  414.  	if (!(__left OP __right))					\
  415. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  416. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  417.  		    "VERIFY3P(%s, %s, %s) failed "			\
  418.  		    "(%p %s %p) " STR, #LEFT, #OP, #RIGHT,		\
  419.  		    (void *)__left, #OP, (void *)__right,		\
  420. @@ -205,7 +205,7 @@ do {									\
  421.  do {									\
  422.  	const int64_t __left = (int64_t)(LEFT);				\
  423.  	if (!(__left == 0))						\
  424. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  425. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  426.  		    "VERIFY0(%s) failed (%lld) " STR, #LEFT,		\
  427.  		    (longlong_t)__left, __VA_ARGS__);			\
  428.  } while (0)
  429. @@ -214,7 +214,7 @@ do {									\
  430.  do {									\
  431.  	const uintptr_t __left = (uintptr_t)(LEFT);			\
  432.  	if (!(__left == 0))						\
  433. -		libspl_assertf(__FILE__, __FUNCTION__, __LINE__,	\
  434. +		libspl_assertf(__FILE__, __func__, __LINE__,		\
  435.  		    "VERIFY0P(%s) failed (%p) " STR, #LEFT,		\
  436.  		    (void *)__left, __VA_ARGS__);			\
  437.  } while (0)
  438. @@ -267,7 +267,7 @@ do {									\
  439.  #define	IMPLY(A, B) \
  440.  	((void)(((!(A)) || (B)) || \
  441.  	    libspl_assert("(" #A ") implies (" #B ")", \
  442. -	    __FILE__, __FUNCTION__, __LINE__)))
  443. +	    __FILE__, __func__, __LINE__)))
  444.  #define	EQUIV(A, B)	VERIFY3B(A, ==, B)
  445.  
  446.  #endif  /* NDEBUG */
  447. diff --git a/module/os/freebsd/zfs/crypto_os.c b/module/os/freebsd/zfs/crypto_os.c
  448. index a4bf3fb64..b9c90af14 100644
  449. --- a/module/os/freebsd/zfs/crypto_os.c
  450. +++ b/module/os/freebsd/zfs/crypto_os.c
  451. @@ -218,7 +218,7 @@ freebsd_crypt_uio_debug_log(boolean_t encrypt,
  452.  
  453.  	printf("%s(%s, %p, { %s, %d, %d, %s }, %p, { %p, %u }, "
  454.  	    "%p, %u, %u)\n",
  455. -	    __FUNCTION__, encrypt ? "encrypt" : "decrypt", input_sessionp,
  456. +	    __func__, encrypt ? "encrypt" : "decrypt", input_sessionp,
  457.  	    c_info->ci_algname, c_info->ci_crypt_type,
  458.  	    (unsigned int)c_info->ci_keylen, c_info->ci_name,
  459.  	    data_uio, key->ck_data,
  460. @@ -253,7 +253,7 @@ freebsd_crypt_newsession(freebsd_crypt_session_t *sessp,
  461.  
  462.  #ifdef FCRYPTO_DEBUG
  463.  	printf("%s(%p, { %s, %d, %d, %s }, { %p, %u })\n",
  464. -	    __FUNCTION__, sessp,
  465. +	    __func__, sessp,
  466.  	    c_info->ci_algname, c_info->ci_crypt_type,
  467.  	    (unsigned int)c_info->ci_keylen, c_info->ci_name,
  468.  	    key->ck_data, (unsigned int)key->ck_length);
  469. @@ -318,7 +318,7 @@ freebsd_crypt_newsession(freebsd_crypt_session_t *sessp,
  470.  bad:
  471.  #ifdef FCRYPTO_DEBUG
  472.  	if (error)
  473. -		printf("%s: returning error %d\n", __FUNCTION__, error);
  474. +		printf("%s: returning error %d\n", __func__, error);
  475.  #endif
  476.  	return (error);
  477.  }
  478. @@ -374,7 +374,7 @@ freebsd_crypt_uio(boolean_t encrypt,
  479.  out:
  480.  #ifdef FCRYPTO_DEBUG
  481.  	if (error)
  482. -		printf("%s: returning error %d\n", __FUNCTION__, error);
  483. +		printf("%s: returning error %d\n", __func__, error);
  484.  #endif
  485.  	if (input_sessionp == NULL) {
  486.  		freebsd_crypt_freesession(session);
  487. diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c
  488. index 9b90a2c3e..a81006454 100644
  489. --- a/module/os/freebsd/zfs/zfs_vnops_os.c
  490. +++ b/module/os/freebsd/zfs/zfs_vnops_os.c
  491. @@ -4721,7 +4721,7 @@ zfs_freebsd_read(struct vop_read_args *ap)
  492.  		printf("%s(%d): Direct I/O read returning EFAULT "
  493.  		    "uio = %p, zfs_uio_offset(uio) = %lu "
  494.  		    "zfs_uio_resid(uio) = %lu\n",
  495. -		    __FUNCTION__, __LINE__, &uio, zfs_uio_offset(&uio),
  496. +		    __func__, __LINE__, &uio, zfs_uio_offset(&uio),
  497.  		    zfs_uio_resid(&uio));
  498.  #endif
  499.  	}
  500. diff --git a/module/os/freebsd/zfs/zio_crypt.c b/module/os/freebsd/zfs/zio_crypt.c
  501. index 8562c42b3..070cb0813 100644
  502. --- a/module/os/freebsd/zfs/zio_crypt.c
  503. +++ b/module/os/freebsd/zfs/zio_crypt.c
  504. @@ -410,7 +410,7 @@ zio_do_crypt_uio_opencrypto(boolean_t encrypt, freebsd_crypt_session_t *sess,
  505.  	if (ret != 0) {
  506.  #ifdef FCRYPTO_DEBUG
  507.  		printf("%s(%d):  Returning error %s\n",
  508. -		    __FUNCTION__, __LINE__, encrypt ? "EIO" : "ECKSUM");
  509. +		    __func__, __LINE__, encrypt ? "EIO" : "ECKSUM");
  510.  #endif
  511.  		ret = SET_ERROR(encrypt ? EIO : ECKSUM);
  512.  	}
  513. @@ -1179,7 +1179,7 @@ zio_crypt_do_indirect_mac_checksum_impl(boolean_t generate, void *buf,
  514.  
  515.  	if (memcmp(digestbuf, cksum, ZIO_DATA_MAC_LEN) != 0) {
  516.  #ifdef FCRYPTO_DEBUG
  517. -		printf("%s(%d): Setting ECKSUM\n", __FUNCTION__, __LINE__);
  518. +		printf("%s(%d): Setting ECKSUM\n", __func__, __LINE__);
  519.  #endif
  520.  		return (SET_ERROR(ECKSUM));
  521.  	}
  522. @@ -1696,7 +1696,7 @@ zio_do_crypt_data(boolean_t encrypt, zio_crypt_key_t *key,
  523.  
  524.  #ifdef FCRYPTO_DEBUG
  525.  	printf("%s(%s, %p, %p, %d, %p, %p, %u, %s, %p, %p, %p)\n",
  526. -	    __FUNCTION__,
  527. +	    __func__,
  528.  	    encrypt ? "encrypt" : "decrypt",
  529.  	    key, salt, ot, iv, mac, datalen,
  530.  	    byteswap ? "byteswap" : "native_endian", plainbuf,
  531. diff --git a/tests/zfs-tests/cmd/idmap_util.c b/tests/zfs-tests/cmd/idmap_util.c
  532. index f332677f5..641ddb71a 100644
  533. --- a/tests/zfs-tests/cmd/idmap_util.c
  534. +++ b/tests/zfs-tests/cmd/idmap_util.c
  535. @@ -156,7 +156,7 @@ log_msg(const char *msg, ...)
  536.  #define	log_errno(msg, args...) \
  537.  	do { \
  538.  		log_msg("%s:%d:%s: [%m] " msg, __FILE__, __LINE__,\
  539. -		    __FUNCTION__, ##args); \
  540. +		    __func__, ##args); \
  541.  	} while (0)
  542.  
  543.  /*
  544. -- 
  545. 2.49.0