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 (26177B)

    

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