diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libspl/include/sys/feature_tests.h | 6 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_dataset.c | 4 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_pool.c | 4 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_sendrecv.c | 2 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_util.c | 2 | ||||
| -rw-r--r-- | lib/libzfsbootenv/lzbe_device.c | 2 | ||||
| -rw-r--r-- | lib/libzutil/zutil_import.c | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/lib/libspl/include/sys/feature_tests.h b/lib/libspl/include/sys/feature_tests.h index c9564b2c3..be0721b50 100644 --- a/lib/libspl/include/sys/feature_tests.h +++ b/lib/libspl/include/sys/feature_tests.h @@ -30,11 +30,11 @@ #define ____cacheline_aligned #define __NORETURN __attribute__((__noreturn__)) -#if !defined(fallthrough) && !defined(_LIBCPP_VERSION) +#if !defined(zfs_fallthrough) && !defined(_LIBCPP_VERSION) #if defined(HAVE_IMPLICIT_FALLTHROUGH) -#define fallthrough __attribute__((__fallthrough__)) +#define zfs_fallthrough __attribute__((__fallthrough__)) #else -#define fallthrough ((void)0) +#define zfs_fallthrough ((void)0) #endif #endif diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c index bbc12877d..6b9f43285 100644 --- a/lib/libzfs/libzfs_dataset.c +++ b/lib/libzfs/libzfs_dataset.c @@ -1363,7 +1363,7 @@ badlabel: (void) zfs_error(hdl, EZFS_BADPROP, errbuf); goto error; } - fallthrough; + zfs_fallthrough; } case ZFS_PROP_SHARESMB: @@ -3783,7 +3783,7 @@ zfs_create(libzfs_handle_t *hdl, const char *path, zfs_type_t type, if (type == ZFS_TYPE_VOLUME) return (zfs_error(hdl, EZFS_VOLTOOBIG, errbuf)); - fallthrough; + zfs_fallthrough; #endif default: return (zfs_standard_error(hdl, errno, errbuf)); diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c index 88c7ee74b..7fafeae9e 100644 --- a/lib/libzfs/libzfs_pool.c +++ b/lib/libzfs/libzfs_pool.c @@ -316,7 +316,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, len); break; } - fallthrough; + zfs_fallthrough; default: (void) strlcpy(buf, "-", len); break; @@ -407,7 +407,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, (void) snprintf(buf, len, "-"); break; } - fallthrough; + zfs_fallthrough; default: (void) snprintf(buf, len, "%llu", (u_longlong_t)intval); } diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index 270190bf1..2ee4beb3c 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -4947,7 +4947,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, (void) zfs_error(hdl, EZFS_BUSY, errbuf); break; } - fallthrough; + zfs_fallthrough; default: (void) zfs_standard_error(hdl, ioctl_errno, errbuf); } diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c index b3f39afe2..3e33ef503 100644 --- a/lib/libzfs/libzfs_util.c +++ b/lib/libzfs/libzfs_util.c @@ -600,8 +600,8 @@ zfs_setprop_error(libzfs_handle_t *hdl, zfs_prop_t prop, int err, (void) zfs_error(hdl, EZFS_VOLTOOBIG, errbuf); break; } + zfs_fallthrough; #endif - fallthrough; default: (void) zfs_standard_error(hdl, err, errbuf); } diff --git a/lib/libzfsbootenv/lzbe_device.c b/lib/libzfsbootenv/lzbe_device.c index 2d9c7b749..39e33324b 100644 --- a/lib/libzfsbootenv/lzbe_device.c +++ b/lib/libzfsbootenv/lzbe_device.c @@ -63,7 +63,7 @@ lzbe_set_boot_device(const char *pool, lzbe_flags_t flag, const char *device) /* Drop this nvlist */ fnvlist_free(nv); } - fallthrough; + zfs_fallthrough; case lzbe_replace: nv = fnvlist_alloc(); break; diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c index 8876e7a7a..d7547c424 100644 --- a/lib/libzutil/zutil_import.c +++ b/lib/libzutil/zutil_import.c @@ -1032,11 +1032,11 @@ zpool_read_label(int fd, nvlist_t **config, int *num_labels) // This shouldn't be possible to // encounter, die if we do. ASSERT(B_FALSE); - fallthrough; + zfs_fallthrough; case EOPNOTSUPP: case ENOSYS: do_slow = B_TRUE; - fallthrough; + zfs_fallthrough; case 0: default: (void) aio_return(&aiocbs[l]); |