From owner-svn-src-projects@freebsd.org Fri Aug 3 01:51:45 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D8991058B56 for ; Fri, 3 Aug 2018 01:51:45 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 517808AAB2; Fri, 3 Aug 2018 01:51:45 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3405819FC2; Fri, 3 Aug 2018 01:51:45 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w731pj41088082; Fri, 3 Aug 2018 01:51:45 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w731pjC1088081; Fri, 3 Aug 2018 01:51:45 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201808030151.w731pjC1088081@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 3 Aug 2018 01:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r337226 - projects/bectl/sbin/bectl X-SVN-Group: projects X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: projects/bectl/sbin/bectl X-SVN-Commit-Revision: 337226 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Aug 2018 01:51:45 -0000 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);