From owner-dev-commits-src-all@freebsd.org Mon Mar 8 03:07:26 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 59E8E562759; Mon, 8 Mar 2021 03:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dv3DG26yQz3JJs; Mon, 8 Mar 2021 03:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3BC4921D96; Mon, 8 Mar 2021 03:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12837Qhw096681; Mon, 8 Mar 2021 03:07:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12837Qen096680; Mon, 8 Mar 2021 03:07:26 GMT (envelope-from git) Date: Mon, 8 Mar 2021 03:07:26 GMT Message-Id: <202103080307.12837Qen096680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hajimu UMEMOTO Subject: git: 006a01374f59 - main - Simplify using nvlist_append_string_array(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ume X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 006a01374f59b839ca1c900efd274a3b92044b15 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2021 03:07:26 -0000 The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/src/commit/?id=006a01374f59b839ca1c900efd274a3b92044b15 commit 006a01374f59b839ca1c900efd274a3b92044b15 Author: Hajimu UMEMOTO AuthorDate: 2021-03-08 03:03:32 +0000 Commit: Hajimu UMEMOTO CommitDate: 2021-03-08 03:03:32 +0000 Simplify using nvlist_append_string_array(). Reported by: hrs MFC after: 1 week --- usr.sbin/rtsold/rtsold.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c index 5e5298bfdadc..c1594ec7420a 100644 --- a/usr.sbin/rtsold/rtsold.c +++ b/usr.sbin/rtsold/rtsold.c @@ -333,10 +333,8 @@ init_capabilities(void) #ifdef WITH_CASPER const char *const scripts[] = { resolvconf_script, managedconf_script, otherconf_script }; - const char *scripts_set[nitems(scripts)]; cap_channel_t *capcasper; nvlist_t *limits; - int count; capcasper = cap_init(); if (capcasper == NULL) @@ -349,12 +347,11 @@ init_capabilities(void) capscript = cap_service_open(capcasper, "rtsold.script"); if (capscript == NULL) return (-1); - count = 0; + limits = nvlist_create(0); for (size_t i = 0; i < nitems(scripts); i++) if (scripts[i] != NULL) - scripts_set[count++] = scripts[i]; - limits = nvlist_create(0); - nvlist_add_string_array(limits, "scripts", scripts_set, count); + nvlist_append_string_array(limits, "scripts", + scripts[i]); if (cap_limit_set(capscript, limits) != 0) return (-1);