Fix deadcode

[zfs.git] / cmd / zpool / zpool_main.c

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index 8aa985b..3d28523 100644 (file)
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -2202,7 +2202,7 @@ get_interval_count(int *argcp, char **argv, unsigned long *iv,
     unsigned long *cnt)
 {
        unsigned long interval = 0, count = 0;
-       int argc = *argcp, errno;
+       int argc = *argcp;
 
        /*
         * Determine if the last argument is an integer or a pool name
@@ -2438,9 +2438,9 @@ print_header(zprop_list_t *pl)
                if (pl->pl_next == NULL && !right_justify)
                        (void) printf("%s", header);
                else if (right_justify)
-                       (void) printf("%*s", pl->pl_width, header);
+                       (void) printf("%*s", (int)pl->pl_width, header);
                else
-                       (void) printf("%-*s", pl->pl_width, header);
+                       (void) printf("%-*s", (int)pl->pl_width, header);
        }
 
        (void) printf("\n");
@@ -2603,33 +2603,6 @@ zpool_do_list(int argc, char **argv)
        return (ret);
 }
 
-static nvlist_t *
-zpool_get_vdev_by_name(nvlist_t *nv, char *name)
-{
-       nvlist_t **child;
-       uint_t c, children;
-       nvlist_t *match;
-       char *path;
-
-       if (nvlist_lookup_nvlist_array(nv, ZPOOL_CONFIG_CHILDREN,
-           &child, &children) != 0) {
-               verify(nvlist_lookup_string(nv, ZPOOL_CONFIG_PATH, &path) == 0);
-               if (strncmp(name, "/dev/dsk/", 9) == 0)
-                       name += 9;
-               if (strncmp(path, "/dev/dsk/", 9) == 0)
-                       path += 9;
-               if (strcmp(name, path) == 0)
-                       return (nv);
-               return (NULL);
-       }
-
-       for (c = 0; c < children; c++)
-               if ((match = zpool_get_vdev_by_name(child[c], name)) != NULL)
-                       return (match);
-
-       return (NULL);
-}
-
 static int
 zpool_do_attach_or_replace(int argc, char **argv, int replacing)
 {
@@ -3269,7 +3242,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 "
@@ -3906,7 +3879,7 @@ upgrade_one(zpool_handle_t *zhp, void *data)
        if (cur_version > cbp->cb_version) {
                (void) printf(gettext("Pool '%s' is already formatted "
                    "using more current version '%llu'.\n"),
-                   zpool_get_name(zhp), cur_version);
+                   zpool_get_name(zhp), (u_longlong_t) cur_version);
                return (0);
        }
        if (cur_version == cbp->cb_version) {
@@ -4147,8 +4120,8 @@ get_history_one(zpool_handle_t *zhp, void *data)
                                continue;
                        (void) snprintf(internalstr,
                            sizeof (internalstr),
-                           "[internal %s txg:%lld] %s",
-                           zfs_history_event_names[ievent], txg,
+                           "[internal %s txg:%llu] %s",
+                           zfs_history_event_names[ievent], (u_longlong_t)txg,
                            pathstr);
                        cmdstr = internalstr;
                }
@@ -4392,7 +4365,7 @@ int
 main(int argc, char **argv)
 {
        int ret;
-       int i;
+       int i = 0;
        char *cmdname;
 
        (void) setlocale(LC_ALL, "");
@@ -4450,6 +4423,7 @@ main(int argc, char **argv)
                (void) fprintf(stderr, gettext("unrecognized "
                    "command '%s'\n"), cmdname);
                usage(B_FALSE);
+               ret = 1;
        }
 
        libzfs_fini(g_zfs);