Fix gcc init pragma warnings

[zfs.git] / lib / libzfs / libzfs_pool.c

diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
index 7df7e91..3cb7bbc 100644 (file)
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@ -228,7 +228,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
 
                case ZPOOL_PROP_GUID:
                        intval = zpool_get_prop_int(zhp, prop, &src);
-                       (void) snprintf(buf, len, "%llu", intval);
+                       (void) snprintf(buf, len, "%llu", (u_longlong_t)intval);
                        break;
 
                case ZPOOL_PROP_ALTROOT:
@@ -295,7 +295,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
                            vs->vs_aux), len);
                        break;
                default:
-                       (void) snprintf(buf, len, "%llu", intval);
+                       (void) snprintf(buf, len, "%llu", (u_longlong_t)intval);
                }
                break;
 
@@ -1238,7 +1238,7 @@ zpool_rewind_exclaim(libzfs_handle_t *hdl, const char *name, boolean_t dryrun,
        (void) nvlist_lookup_int64(nv, ZPOOL_CONFIG_REWIND_TIME, &loss);
 
        if (localtime_r((time_t *)&rewindto, &t) != NULL &&
-           strftime(timestr, 128, 0, &t) != 0) {
+           strftime(timestr, 128, "%c", &t) != 0) {
                if (dryrun) {
                        (void) printf(dgettext(TEXT_DOMAIN,
                            "Would be able to return %s "
@@ -1253,13 +1253,14 @@ zpool_rewind_exclaim(libzfs_handle_t *hdl, const char *name, boolean_t dryrun,
                        (void) printf(dgettext(TEXT_DOMAIN,
                            "%s approximately %lld "),
                            dryrun ? "Would discard" : "Discarded",
-                           (loss + 30) / 60);
+                           ((longlong_t)loss + 30) / 60);
                        (void) printf(dgettext(TEXT_DOMAIN,
                            "minutes of transactions.\n"));
                } else if (loss > 0) {
                        (void) printf(dgettext(TEXT_DOMAIN,
                            "%s approximately %lld "),
-                           dryrun ? "Would discard" : "Discarded", loss);
+                           dryrun ? "Would discard" : "Discarded",
+                           (longlong_t)loss);
                        (void) printf(dgettext(TEXT_DOMAIN,
                            "seconds of transactions.\n"));
                }
@@ -1298,7 +1299,7 @@ zpool_explain_recover(libzfs_handle_t *hdl, const char *name, int reason,
            "Recovery is possible, but will result in some data loss.\n"));
 
        if (localtime_r((time_t *)&rewindto, &t) != NULL &&
-           strftime(timestr, 128, 0, &t) != 0) {
+           strftime(timestr, 128, "%c", &t) != 0) {
                (void) printf(dgettext(TEXT_DOMAIN,
                    "\tReturning the pool to its state as of %s\n"
                    "\tshould correct the problem.  "),
@@ -1312,11 +1313,13 @@ zpool_explain_recover(libzfs_handle_t *hdl, const char *name, int reason,
        if (loss > 120) {
                (void) printf(dgettext(TEXT_DOMAIN,
                    "Approximately %lld minutes of data\n"
-                   "\tmust be discarded, irreversibly.  "), (loss + 30) / 60);
+                   "\tmust be discarded, irreversibly.  "),
+                   ((longlong_t)loss + 30) / 60);
        } else if (loss > 0) {
                (void) printf(dgettext(TEXT_DOMAIN,
                    "Approximately %lld seconds of data\n"
-                   "\tmust be discarded, irreversibly.  "), loss);
+                   "\tmust be discarded, irreversibly.  "),
+                   (longlong_t)loss);
        }
        if (edata != 0 && edata != UINT64_MAX) {
                if (edata == 1) {
@@ -2260,7 +2263,7 @@ zpool_vdev_fault(zpool_handle_t *zhp, uint64_t guid, vdev_aux_t aux)
        libzfs_handle_t *hdl = zhp->zpool_hdl;
 
        (void) snprintf(msg, sizeof (msg),
-           dgettext(TEXT_DOMAIN, "cannot fault %llu"), guid);
+           dgettext(TEXT_DOMAIN, "cannot fault %llu"), (u_longlong_t)guid);
 
        (void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
        zc.zc_guid = guid;
@@ -2295,7 +2298,7 @@ zpool_vdev_degrade(zpool_handle_t *zhp, uint64_t guid, vdev_aux_t aux)
        libzfs_handle_t *hdl = zhp->zpool_hdl;
 
        (void) snprintf(msg, sizeof (msg),
-           dgettext(TEXT_DOMAIN, "cannot degrade %llu"), guid);
+           dgettext(TEXT_DOMAIN, "cannot degrade %llu"), (u_longlong_t)guid);
 
        (void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
        zc.zc_guid = guid;
@@ -2954,7 +2957,7 @@ zpool_vdev_clear(zpool_handle_t *zhp, uint64_t guid)
 
        (void) snprintf(msg, sizeof (msg),
            dgettext(TEXT_DOMAIN, "cannot clear errors for %llx"),
-           guid);
+           (u_longlong_t)guid);
 
        (void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
        zc.zc_guid = guid;
@@ -3475,7 +3478,7 @@ zpool_obj_to_path(zpool_handle_t *zhp, uint64_t dsobj, uint64_t obj,
 
        if (dsobj == 0) {
                /* special case for the MOS */
-               (void) snprintf(pathname, len, "<metadata>:<0x%llx>", obj);
+               (void) snprintf(pathname, len, "<metadata>:<0x%llx>", (longlong_t)obj);
                return;
        }
 
@@ -3486,7 +3489,7 @@ zpool_obj_to_path(zpool_handle_t *zhp, uint64_t dsobj, uint64_t obj,
            ZFS_IOC_DSOBJ_TO_DSNAME, &zc) != 0) {
                /* just write out a path of two object numbers */
                (void) snprintf(pathname, len, "<0x%llx>:<0x%llx>",
-                   dsobj, obj);
+                   (longlong_t)dsobj, (longlong_t)obj);
                return;
        }
        (void) strlcpy(dsname, zc.zc_value, sizeof (dsname));
@@ -3507,7 +3510,7 @@ zpool_obj_to_path(zpool_handle_t *zhp, uint64_t dsobj, uint64_t obj,
                            dsname, zc.zc_value);
                }
        } else {
-               (void) snprintf(pathname, len, "%s:<0x%llx>", dsname, obj);
+               (void) snprintf(pathname, len, "%s:<0x%llx>", dsname, (longlong_t)obj);
        }
        free(mntpnt);
 }