From nobody Fri Feb 03 15:37:41 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 4P7ftF6Rr2z3kR2f; Fri, 3 Feb 2023 15:37:41 +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 4P7ftF5yNFz3CZZ; Fri, 3 Feb 2023 15:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675438661; 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=AXNfsEUum0kRezk2ivoFW7gsvqR99sVwiZ86gHVNHBw=; b=CcHxnBpagCNM2NkVrKtQvenCqn0mkztlSx31HcYZgDxJQrqT8mtfqncFc+0KAHGGFZEcPd +Roib7Iba4nc/TAe/jBU847sGzIsDMlZY8N9wYZsOWANQeTjk5VVvAzktv+nXfQeX6Iilu LaAvGwxkF/LUSP+Y5lHG8hVIEcXfYqXKdFCMg0lVk6+4jtkggTW1uXD2f1TRHh+ggYCdyp 5Azb4Zl7SLJE9bhDX5y6wygCSOWrIEA9ZHA55qLFf3TbNf3I+KwbEOfQNm6YHBjYyFKF5N TCy67JlJreOhPDYGgv11DOlztAWzqmrHAhpshA+TE2Q8Qh00HWwnyQY+fk28VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675438661; 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=AXNfsEUum0kRezk2ivoFW7gsvqR99sVwiZ86gHVNHBw=; b=BML+w3XmhIZxUjvNJ4hEkFv5XpTnINp4HGs+uI095dvg39ak1RMEK9ghiXHROTdPTOabLU S7BuQXIAV7Cs6rZJHz3d3A1Op4XNt4tPo1enkDXsooT9HPeYag7rzPzn4cMjAxxREItVEO 379guZEAiu6dVnqgVA1dDW1lObN0cWB5DTgCAnFG43T3f3yBTsdfpTBJY1BMyTWDO6Aw1E eGJK4yUVb9v4RvHGAkjx3oeYhq7IwV88T6E4uJmW7W0aUexHIvOILr2MFniyakP0rOWeK7 0JQPmDudxUUWz+BkBb86O4eIpItsA/sdWZDxsyUvq1Gr5uaQb7Nf6deqpfNWGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675438661; a=rsa-sha256; cv=none; b=WvvH1IST/Rf+ElXkHwCKrGT01Q4BwqLizHGnL5cSyhTxpY7Hkbob3Qkn+f2W47SV4VunbS UwA1IsAfQ1t5Dd3Tr51zqhoE//BS4k8Ji6mtxLwHf3xOFixzFWeBcXXhDuL7lK/RFEZjEP Xzta3hEN9F3gF0NvMVRv518xEKVZEvD+u9byICTISEq9Ex3Mtr+sys6nB5mEmWUf9o63ho M6s7twgAZeFX5QZJatAiGW2pUSakIIvafYJPTzmKC+OMthrmMGrmqFKnMo9aLScrxlktpy nOKHbPmq4zH9r0ZfLQFJL/DT7TCk5lT4BkgMBPuQjXBhQaGisyjHRcsAF2SG5A== 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 4P7ftF519rzfSk; Fri, 3 Feb 2023 15:37:41 +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 313FbfC9099173; Fri, 3 Feb 2023 15:37:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313FbfF0099172; Fri, 3 Feb 2023 15:37:41 GMT (envelope-from git) Date: Fri, 3 Feb 2023 15:37:41 GMT Message-Id: <202302031537.313FbfF0099172@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: cb96a0ef0040 - main - cp: Minor code cleanup. 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: cb96a0ef0040fa7968245ab203ab70a7ed2d275d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cb96a0ef0040fa7968245ab203ab70a7ed2d275d commit cb96a0ef0040fa7968245ab203ab70a7ed2d275d Author: Dag-Erling Smørgrav AuthorDate: 2023-02-03 15:37:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-02-03 15:37:37 +0000 cp: Minor code cleanup. * Fix includes in utils.c, cf. style(9). * Fix type mismatch: readlink(2) returns ssize_t, not int. * It is not necessary to set errno to 0 as fts_read(3) already does it. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D38369 --- bin/cp/cp.c | 3 +-- bin/cp/utils.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index dbae4b535843..e38cd97f4369 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -311,8 +311,7 @@ copy(char *argv[], enum op type, int fts_options, struct stat *root_stat) recurse_path = NULL; if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL) err(1, "fts_open"); - for (badcp = rval = 0; errno = 0, (curr = fts_read(ftsp)) != NULL; - badcp = 0) { + for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) { switch (curr->fts_info) { case FTS_NS: case FTS_DNR: diff --git a/bin/cp/utils.c b/bin/cp/utils.c index a3a498714f43..8c1c350ff6f1 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -37,9 +37,8 @@ static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94"; #include __FBSDID("$FreeBSD$"); -#include -#include #include +#include #include #include @@ -241,7 +240,7 @@ done: int copy_link(const FTSENT *p, int exists) { - int len; + ssize_t len; char llink[PATH_MAX]; if (exists && nflag) {