summaryrefslogtreecommitdiffstats
path: root/cmd/zpool
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-08-26 09:58:04 -0700
committerBrian Behlendorf <[email protected]>2010-08-31 08:38:43 -0700
commitd4ed667343c3dac114642b9f6cb4f7baa3ff7334 (patch)
tree16b3f627625f83d0214446fb6f867e100f1a34c5 /cmd/zpool
parent1fde1e37208c2f56c72c70a06676676f04b65998 (diff)
Fix gcc uninitialized variable warnings
Gcc -Wall warn: 'uninitialized variable' Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'cmd/zpool')
-rw-r--r--cmd/zpool/zpool_main.c5
-rw-r--r--cmd/zpool/zpool_vdev.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index 85a51de40..fa16836fe 100644
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -3269,7 +3269,7 @@ print_scan_status(pool_scan_stat_t *ps)
*/
if (ps->pss_state == DSS_FINISHED) {
uint64_t minutes_taken = (end - start) / 60;
- char *fmt;
+ char *fmt = NULL;
if (ps->pss_func == POOL_SCAN_SCRUB) {
fmt = gettext("scrub repaired %s in %lluh%um with "
@@ -4392,7 +4392,7 @@ int
main(int argc, char **argv)
{
int ret;
- int i;
+ int i = 0;
char *cmdname;
(void) setlocale(LC_ALL, "");
@@ -4450,6 +4450,7 @@ main(int argc, char **argv)
(void) fprintf(stderr, gettext("unrecognized "
"command '%s'\n"), cmdname);
usage(B_FALSE);
+ ret = 1;
}
libzfs_fini(g_zfs);
diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index 53c2e60b7..0c224903d 100644
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c
@@ -548,7 +548,7 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
uint_t c, children;
nvlist_t *nv;
char *type;
- replication_level_t lastrep, rep, *ret;
+ replication_level_t lastrep = { 0 }, rep, *ret;
boolean_t dontreport;
ret = safe_malloc(sizeof (replication_level_t));