diff options
| author | Jorgen Lundman <[email protected]> | 2022-02-16 01:58:59 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-15 08:58:59 -0800 |
| commit | 9a70e97fe14addacdc4139fd0ae4bce1c3344456 (patch) | |
| tree | 25eab04b16e2018fa68e09951f405c5484b1a669 /lib/libzfs | |
| parent | ae07fc1393062507b62d9d475e57393be590e432 (diff) | |
Rename fallthrough to zfs_fallthrough
Unfortunately macOS has obj-C keyword "fallthrough" in the OS headers.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Damian Szuberski <[email protected]>
Signed-off-by: Jorgen Lundman <[email protected]>
Closes #13097
Diffstat (limited to 'lib/libzfs')
| -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 |
4 files changed, 6 insertions, 6 deletions
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); } |