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 /cmd | |
| 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 'cmd')
| -rw-r--r-- | cmd/mount_zfs/mount_zfs.c | 2 | ||||
| -rw-r--r-- | cmd/zdb/zdb.c | 2 | ||||
| -rw-r--r-- | cmd/zpool_influxdb/zpool_influxdb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c index 23019c623..669ed88f9 100644 --- a/cmd/mount_zfs/mount_zfs.c +++ b/cmd/mount_zfs/mount_zfs.c @@ -390,7 +390,7 @@ main(int argc, char **argv) return (MOUNT_SYSERR); } #endif - fallthrough; + zfs_fallthrough; default: (void) fprintf(stderr, gettext("filesystem " "'%s' can not be mounted: %s\n"), dataset, diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index b4c98fe4d..3fbe75106 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -4655,7 +4655,7 @@ dump_path_impl(objset_t *os, uint64_t obj, char *name, uint64_t *retobj) case DMU_OT_DIRECTORY_CONTENTS: if (s != NULL && *(s + 1) != '\0') return (dump_path_impl(os, child_obj, s + 1, retobj)); - fallthrough; + zfs_fallthrough; case DMU_OT_PLAIN_FILE_CONTENTS: if (retobj != NULL) { *retobj = child_obj; diff --git a/cmd/zpool_influxdb/zpool_influxdb.c b/cmd/zpool_influxdb/zpool_influxdb.c index 85a3f1f29..2d6859efb 100644 --- a/cmd/zpool_influxdb/zpool_influxdb.c +++ b/cmd/zpool_influxdb/zpool_influxdb.c @@ -118,7 +118,7 @@ escape_string(const char *s) case '=': case '\\': *d++ = '\\'; - fallthrough; + zfs_fallthrough; default: *d = *c; } |