diff options
| author | Paul Dagnelie <pcd@delphix.com> | 2015-10-18 09:53:48 -0700 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2015-10-18 09:53:48 -0700 |
| commit | 9a686fbc186e8e2a64e9a5094d44c7d6fa0ea167 (patch) | |
| tree | 7bc4e0dedf84a59acb8f3316f090b1b1f1cb6acf /usr/src/cmd | |
| parent | 21227944c2bcc086121a5428f3f9d2496ba646f5 (diff) | |
| download | illumos-joyent-9a686fbc186e8e2a64e9a5094d44c7d6fa0ea167.tar.gz | |
6328 Fix cstyle errors in zfs codebase
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Alex Reece <alex@delphix.com>
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Jorgen Lundman <lundman@lundman.net>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/zoneadm/zoneadm.c | 12 | ||||
| -rw-r--r-- | usr/src/cmd/zoneadmd/vplat.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/zpool/zpool_main.c | 3 |
3 files changed, 12 insertions, 7 deletions
diff --git a/usr/src/cmd/zoneadm/zoneadm.c b/usr/src/cmd/zoneadm/zoneadm.c index 6d80fcd8c3..21bc9248f4 100644 --- a/usr/src/cmd/zoneadm/zoneadm.c +++ b/usr/src/cmd/zoneadm/zoneadm.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2014 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. */ /* @@ -3120,7 +3121,7 @@ done: static void warn_dev_match(zone_dochandle_t s_handle, char *source_zone, - zone_dochandle_t t_handle, char *target_zone) + zone_dochandle_t t_handle, char *target_zone) { int err; struct zone_devtab s_devtab; @@ -3242,7 +3243,7 @@ print_fs_warnings(struct zone_fstab *s_fstab, struct zone_fstab *t_fstab) static void warn_fs_match(zone_dochandle_t s_handle, char *source_zone, - zone_dochandle_t t_handle, char *target_zone) + zone_dochandle_t t_handle, char *target_zone) { int err; struct zone_fstab s_fstab; @@ -3286,7 +3287,7 @@ warn_fs_match(zone_dochandle_t s_handle, char *source_zone, */ static void warn_ip_match(zone_dochandle_t s_handle, char *source_zone, - zone_dochandle_t t_handle, char *target_zone) + zone_dochandle_t t_handle, char *target_zone) { int err; struct zone_nwiftab s_nwiftab; @@ -3341,7 +3342,7 @@ warn_ip_match(zone_dochandle_t s_handle, char *source_zone, static void warn_dataset_match(zone_dochandle_t s_handle, char *source, - zone_dochandle_t t_handle, char *target) + zone_dochandle_t t_handle, char *target) { int err; struct zone_dstab s_dstab; @@ -3505,7 +3506,8 @@ copy_zone(char *src, char *dst) /* ARGSUSED */ int -zfm_print(const struct mnttab *p, void *r) { +zfm_print(const struct mnttab *p, void *r) +{ zerror(" %s\n", p->mnt_mountp); return (0); } diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c index b9954b81b3..437385ee09 100644 --- a/usr/src/cmd/zoneadmd/vplat.c +++ b/usr/src/cmd/zoneadmd/vplat.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent Inc. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. */ /* @@ -4292,7 +4293,8 @@ remove_mlps(zlog_t *zlogp, zoneid_t zoneid) } int -prtmount(const struct mnttab *fs, void *x) { +prtmount(const struct mnttab *fs, void *x) +{ zerror((zlog_t *)x, B_FALSE, " %s", fs->mnt_mountp); return (0); } diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c index 982057d1b5..18af5a2763 100644 --- a/usr/src/cmd/zpool/zpool_main.c +++ b/usr/src/cmd/zpool/zpool_main.c @@ -192,7 +192,8 @@ static boolean_t log_history = B_TRUE; static uint_t timestamp_fmt = NODATE; static const char * -get_usage(zpool_help_t idx) { +get_usage(zpool_help_t idx) +{ switch (idx) { case HELP_ADD: return (gettext("\tadd [-fn] <pool> <vdev> ...\n")); |