Date: Fri, 3 Aug 2018 01:51:45 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r337226 - projects/bectl/sbin/bectl Message-ID: <201808030151.w731pjC1088081@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Aug 3 01:51:44 2018 New Revision: 337226 URL: https://svnweb.freebsd.org/changeset/base/337226 Log: bectl(8): Just use a single pointer for all string props Modified: projects/bectl/sbin/bectl/bectl.c Modified: projects/bectl/sbin/bectl/bectl.c ============================================================================== --- projects/bectl/sbin/bectl/bectl.c Fri Aug 3 01:46:46 2018 (r337225) +++ projects/bectl/sbin/bectl/bectl.c Fri Aug 3 01:51:44 2018 (r337226) @@ -425,15 +425,15 @@ print_dataset(nvpair_t *cur, struct printc *pc) char buf[BUFSZ]; unsigned long long ctimenum, space; nvlist_t *dsprops; - char *creation, *mnt, *name, *spacestr; + char *propstr; int active_colsz; boolean_t active_now, active_reboot; - name = nvpair_name(cur); + propstr = nvpair_name(cur); /* XXX TODO: Some views show snapshots */ - if (strchr(name, '@') != NULL) + if (strchr(propstr, '@') != NULL) return; - printf("%*s ", pc->be_colsz, name); + printf("%*s ", pc->be_colsz, propstr); active_colsz = pc->active_colsz_def; nvpair_value_nvlist(cur, &dsprops); @@ -452,13 +452,13 @@ print_dataset(nvpair_t *cur, struct printc *pc) active_colsz--; } printf("%*s ", -active_colsz, " "); - if (nvlist_lookup_string(dsprops, "mountpoint", &mnt) == 0) - printf("%*s ", pc->mount_colsz, mnt); + if (nvlist_lookup_string(dsprops, "mountpoint", &propstr) == 0) + printf("%*s ", pc->mount_colsz, propstr); else printf("%*s ", pc->mount_colsz, "-"); - if (nvlist_lookup_string(dsprops, "used", &spacestr) == 0) { - space = strtoull(spacestr, NULL, 10); + if (nvlist_lookup_string(dsprops, "used", &propstr) == 0) { + space = strtoull(propstr, NULL, 10); /* Alas, there's more to it,. */ humanize_number(buf, 6, space, "", HN_AUTOSCALE, @@ -467,8 +467,8 @@ print_dataset(nvpair_t *cur, struct printc *pc) } else printf("%*s ", pc->space_colsz, "-"); - if (nvlist_lookup_string(dsprops, "creation", &creation) == 0) { - ctimenum = strtoull(creation, NULL, 10); + if (nvlist_lookup_string(dsprops, "creation", &propstr) == 0) { + ctimenum = strtoull(propstr, NULL, 10); strftime(buf, BUFSZ, "%Y-%m-%d %H:%M", localtime((time_t *)&ctimenum)); printf("%s", buf);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808030151.w731pjC1088081>