mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-03 17:11:32 +00:00
Code Issues Releases Activity

bectl(8): Just use a single pointer for all string props

Browse Source
This commit is contained in:
Kyle Evans 2018-08-03 01:51:44 +00:00
parent 970fd6543a
commit 74c55b3d38
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/bectl/; revision=337226
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sbin/bectl/bectl.c
View File

@ -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);