Fix gcc fortify source warnings

[zfs.git] / cmd / ztest / ztest.c

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index a6503f4..5e21e62 100644 (file)
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -2022,7 +2022,7 @@ ztest_od_init(ztest_od_t *od, uint64_t id, char *tag, uint64_t index,
        od->od_gen = 0;
 
        (void) snprintf(od->od_name, sizeof (od->od_name), "%s(%lld)[%llu]",
-           tag, (int64_t)id, index);
+           tag, (longlong_t)id, (u_longlong_t)index);
 }
 
 /*
@@ -2592,7 +2592,7 @@ grow_vdev(vdev_t *vd, void *arg)
                return (vd);
 
        fsize = lseek(fd, 0, SEEK_END);
-       (void) ftruncate(fd, *newsize);
+       VERIFY(ftruncate(fd, *newsize) == 0);
 
        if (zopt_verbose >= 6) {
                (void) printf("%s grew from %lu to %lu bytes\n",
@@ -3042,11 +3042,16 @@ ztest_dsl_dataset_cleanup(char *osname, uint64_t id)
        char snap3name[MAXNAMELEN];
        int error;
 
-       (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname, id);
-       (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname, id);
-       (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name, id);
-       (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname, id);
-       (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name, id);
+       (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu",
+           osname, (u_longlong_t)id);
+       (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu",
+           osname, (u_longlong_t)id);
+       (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu",
+           clone1name, (u_longlong_t)id);
+       (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu",
+           osname, (u_longlong_t)id);
+       (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu",
+           clone1name, (u_longlong_t)id);
 
        error = dmu_objset_destroy(clone2name, B_FALSE);
        if (error && error != ENOENT)
@@ -3086,11 +3091,16 @@ ztest_dsl_dataset_promote_busy(ztest_ds_t *zd, uint64_t id)
 
        ztest_dsl_dataset_cleanup(osname, id);
 
-       (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname, id);
-       (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname, id);
-       (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name, id);
-       (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname, id);
-       (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name, id);
+       (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu",
+           osname, (u_longlong_t)id);
+       (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu",
+           osname, (u_longlong_t)id);
+       (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu",
+           clone1name, (u_longlong_t)id);
+       (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu",
+           osname, (u_longlong_t)id);
+       (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu",
+           clone1name, (u_longlong_t)id);
 
        error = dmu_objset_snapshot(osname, strchr(snap1name, '@')+1,
            NULL, NULL, B_FALSE, B_FALSE, -1);
@@ -3912,7 +3922,7 @@ ztest_fzap(ztest_ds_t *zd, uint64_t id)
                int error;
 
                (void) snprintf(name, sizeof (name), "fzap-%llu-%llu",
-                   id, value);
+                   (u_longlong_t)id, (u_longlong_t)value);
 
                tx = dmu_tx_create(os);
                dmu_tx_hold_zap(tx, object, B_TRUE, name);
@@ -5449,7 +5459,8 @@ main(int argc, char **argv)
        process_options(argc, argv);
 
        /* Override location of zpool.cache */
-       (void) asprintf((char **)&spa_config_path, "%s/zpool.cache", zopt_dir);
+       VERIFY(asprintf((char **)&spa_config_path, "%s/zpool.cache",
+           zopt_dir) != -1);
 
        /*
         * Blow away any existing copy of zpool.cache