diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-03-29 10:07:34 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-03-29 10:07:34 +0000 |
| commit | da5137abdf463bb5fee85061958a14dd12bc043e (patch) | |
| tree | ffffad3f1648c73607c327cf262a2033075f4563 /sys/contrib/openzfs/lib/libuutil | |
| parent | ae6aa2d43daa6276dd18dc974a1c5b7c15264615 (diff) | |
| parent | bc3f12bfac152a0c28951cec92340ba14f9ccee9 (diff) | |
| download | src-da5137abdf463bb5fee85061958a14dd12bc043e.tar.gz src-da5137abdf463bb5fee85061958a14dd12bc043e.zip | |
zfs: merge openzfs/zfs@bc3f12bfa (master) into main
Notable upstream pull request merges:
#12083 libzfs: FreeBSD doesn't resize partitions for you
#13106 add physical device size to SIZE column in 'zpool list -v'
#13158 Allow zfs send to exclude datasets
#13190 module: zfs: zio_inject: zio_match_handler: don't << -1
#13219 FreeBSD: add missing replay check to an assert in zfs_xvattr_set
#13220 module: freebsd: avoid a taking a destroyed lock in zfs_zevent bits
#13221 Fix ACL checks for NFS kernel server
Obtained from: OpenZFS
OpenZFS commit: bc3f12bfac152a0c28951cec92340ba14f9ccee9
Diffstat (limited to 'sys/contrib/openzfs/lib/libuutil')
| -rw-r--r-- | sys/contrib/openzfs/lib/libuutil/uu_pname.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/openzfs/lib/libuutil/uu_pname.c b/sys/contrib/openzfs/lib/libuutil/uu_pname.c index b6c9f2cc03ef..610b8585dcbf 100644 --- a/sys/contrib/openzfs/lib/libuutil/uu_pname.c +++ b/sys/contrib/openzfs/lib/libuutil/uu_pname.c @@ -40,7 +40,7 @@ static const char *pname; -static _Noreturn void +static __attribute__((noreturn)) void uu_die_internal(int status, const char *format, va_list alist); int uu_exit_ok_value = EXIT_SUCCESS; @@ -110,7 +110,7 @@ uu_warn(const char *format, ...) va_end(alist); } -static __attribute__((format(printf, 2, 0))) _Noreturn void +static __attribute__((format(printf, 2, 0))) __attribute__((noreturn)) void uu_die_internal(int status, const char *format, va_list alist) { uu_warn_internal(errno, format, alist); |