diff options
| author | Brian Behlendorf <[email protected]> | 2017-01-17 14:42:56 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-01-17 14:42:56 -0800 |
| commit | 8e896579562385b76fd44b7c86084f452043e7fd (patch) | |
| tree | 236ed6070a3c034775c7d3586b878f4643db90ba /cmd/zpool/zpool_iter.c | |
| parent | 2dbf1bf8296f66f24d5e404505c991bfbeec7808 (diff) | |
OpenZFS 6551 - cmd/zpool: cleanup gcc warnings
Porting Notes:
- Many of the fixes proposed by this patch were already applied.
In the cases where a different but equivalent fix was made the
code was updated with the OpenZFS version to minimize differences.
- The zpool_get_vdev_by_name() function was previously removed
by commit 235db0a.
Authored by: Igor Kozhukhov <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Andy Stormont <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Haakan T Johansson <[email protected]>
Ported-by: Brian Behlendorf <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/6551
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/b327cd3
Closes #5590
Diffstat (limited to 'cmd/zpool/zpool_iter.c')
| -rw-r--r-- | cmd/zpool/zpool_iter.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/zpool/zpool_iter.c b/cmd/zpool/zpool_iter.c index 309247b6b..e93dc0f89 100644 --- a/cmd/zpool/zpool_iter.c +++ b/cmd/zpool/zpool_iter.c @@ -23,7 +23,9 @@ * Use is subject to license terms. */ - +/* + * Copyright 2016 Igor Kozhukhov <[email protected]>. + */ #include <libintl.h> #include <libuutil.h> @@ -132,7 +134,8 @@ pool_list_get(int argc, char **argv, zprop_list_t **proplist, int *err) for (i = 0; i < argc; i++) { zpool_handle_t *zhp; - if ((zhp = zpool_open_canfail(g_zfs, argv[i]))) { + if ((zhp = zpool_open_canfail(g_zfs, argv[i])) != + NULL) { if (add_pool(zhp, zlp) != 0) *err = B_TRUE; } else { |