From nobody Wed May 10 13:46:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGbsQ0X0lz49w0H; Wed, 10 May 2023 13:46:18 +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 4QGbsP6f91z3kjM; Wed, 10 May 2023 13:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683726377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4yU5W3RHaRX1RPXoc++j0eR7eaJVnum3SWgT/+Ngns=; b=pPl/jjGOJcWffKEPJUWNeDjpyMUGRxYykHwyiPzNLN+Q4/tubXOQM7ldTRY4vXNkUSJve0 pkd+fr/a6y+aF5AHd60Qk6AYjdgaBPJh/mHWOM7mHeouqx3E0Ssn82ZkQ8oThsq+s+EB+x zjjWD5d4R9HFGm9ZMS/nnsxt173FBR4Gm8QfJF48hi5V1DimU+Fosk7/jq1A5rcrMPcQbt +mnMDo4Zr+BysDTccExNYzI7ruFdRad9C2jx7b7IWvLEK0dFNvhGhN2cA3t8V4lkyVhVr4 TLNlHz/+QlTI6BK24G43aWijLA6QXNoikKZB5OnE2NthIOsp2Mrl810UO/xaIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683726377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4yU5W3RHaRX1RPXoc++j0eR7eaJVnum3SWgT/+Ngns=; b=Mh8dKqSRfnpIbG4A0V2bUobvlSx1SJK//4j0id4UKrYryE2vH4A+XxwYHxLneQIQt5x4xd hlBepJ/TMHh5stnBPegfgSndqMk/I+DYixCmw62Y8SWE+wpKqQ3twu4yOAPnGFdAMCJsZX gaMaDy2R3fj6QAH+8uYqdA38cJvLWoINiMRWuIxGyQVygOzVyJCZVuVMVlwR/VUeplUpXI fLZuRtnzD3S7Wpjq9ssEiFPXxcxEKWF0XGFOf+rQWOp2RVV+0ovXFgXKAUZ9hsOgFkjzj4 JceDHIpr8efLWTMfNrt273/jvN2qDUs/kZVShdgjfV7RNz3MlZJ/ZPNVPiz96w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683726377; a=rsa-sha256; cv=none; b=p5P2dvzL67xWXVECg5raOiFJp/oTvOlyfXdqIcrhOatqzMUYBemTF0DFKER+PZz4vGykZ8 1fxgNtmfcJBH6L/mfVLXhcjxtHBeZwLi9/RcqwIUydenj6stbD3WR0jPF1gswzJXJ83Hgu pgHNH7cFxtRm4Z4TaGB8bvrL2kRVfM7/IgtuQozZiTIey8nkvWI/CuaRkj/fmxAJyuHW7X EOfn1bAV+Y1DGQdpS67FVkL1eEMrD1pP+YKkhQ4b09jIEmaaT9HcNkOBqJg9SYsyEXjQWw UGebSdarDdzntymQyy7EznS7N6SugtSM1dbqqZw+LXzpy1Tpkei3fotdDYqejQ== 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 4QGbsP5jT0z1Bqd; Wed, 10 May 2023 13:46:17 +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 34ADkHAA021334; Wed, 10 May 2023 13:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ADkHZY021333; Wed, 10 May 2023 13:46:17 GMT (envelope-from git) Date: Wed, 10 May 2023 13:46:17 GMT Message-Id: <202305101346.34ADkHZY021333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: b55bc49e8694 - main - tsort: Replace bcopy() with memcpy(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b55bc49e8694d9226a82041ff23ad61a5c7a6a76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b55bc49e8694d9226a82041ff23ad61a5c7a6a76 commit b55bc49e8694d9226a82041ff23ad61a5c7a6a76 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-10 13:45:38 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-10 13:45:38 +0000 tsort: Replace bcopy() with memcpy(). Also fix an indentation error I introduced in the previous commit. Fixes: cb46f47c7969 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40042 --- usr.bin/tsort/tsort.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c index b2dbe9beb799..53c66e44c76a 100644 --- a/usr.bin/tsort/tsort.c +++ b/usr.bin/tsort/tsort.c @@ -183,8 +183,8 @@ main(int argc, char *argv[]) /* do the sort */ tsort(); - if (ferror(stdout) != 0 || fflush(stdout) != 0) - err(1, "stdout"); + if (ferror(stdout) != 0 || fflush(stdout) != 0) + err(1, "stdout"); exit(0); } @@ -251,7 +251,7 @@ get_node(char *name) switch ((*db->get)(db, &key, &data, 0)) { case 0: - bcopy(data.data, &n, sizeof(n)); + memcpy(&n, data.data, sizeof(n)); return (n); case 1: break; @@ -268,7 +268,7 @@ get_node(char *name) n->n_arcs = NULL; n->n_refcnt = 0; n->n_flags = 0; - bcopy(name, n->n_name, key.size); + memcpy(n->n_name, name, key.size); /* Add to linked list. */ if ((n->n_next = graph) != NULL)