From nobody Mon Jul 18 00:24:50 2022 X-Original-To: dev-commits-src-main@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 4LmN5G5fK9z4WZ53; Mon, 18 Jul 2022 00:24:50 +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 4LmN5G539zz3jTj; Mon, 18 Jul 2022 00:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658103890; 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=PjbdH6w1/n1o1yr9wZqKxKufLDZfQSNpE1OMoP5nR3A=; b=cRawKJdwkdvxk8keLLPZz5fQkwCHLYuNqcqb+T7Ey67brErykN9UwXsP3XOyRCNsYa02hj r5RY7ajHd57eEKy+QmH1WotqDQOKgEwmPbnti+naQVOBZrtTZyPCk3B/Ir3n4GCGsu68IK L8pm/TRZZ2U1qV704CypKBFV2qOwuutQiC9DtzFuV/z+sMkD11RQN54z9IZ9LbSGWFyCYe zeqyG8owS5gqHFxPwv1BkwEck9VkGlR32OM0Wdcfyazqi4ylziaGH+NAq7Avw1Pow4e2/l Cz/q1C8vUh0DVXlfWNJN/9UkQkfyaH6/a02PN0hutl1BGp0OzD64G7rY1CIGuA== 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 4LmN5G3t6LzJvG; Mon, 18 Jul 2022 00:24:50 +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 26I0Oojs073199; Mon, 18 Jul 2022 00:24:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26I0Oos6073197; Mon, 18 Jul 2022 00:24:50 GMT (envelope-from git) Date: Mon, 18 Jul 2022 00:24:50 GMT Message-Id: <202207180024.26I0Oos6073197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 1fbfa7a8dcd0 - main - usr.bin/cksum: localize _total variables. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fbfa7a8dcd091e79754017cb543bab01fa6c157 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658103890; 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=PjbdH6w1/n1o1yr9wZqKxKufLDZfQSNpE1OMoP5nR3A=; b=f0+VmfKFM83OBtvG4qDNtoz7F8oIysSlt3dIXCyMgupe87aOGqmnfcBzpunIsIsGuaNuQd Jln/B7Tyx7WTwEqtt/fdNPoCud2Ipxu1gCdknXW98ZX26ZXTl36m603FN92fqxMFG12pAH VZnCUL3WC3NwiDe1OWZ5YYFj52zRw1z7VqT797DMs5+ktuHuHpZtaD47dBcz8wH0Clc4P9 TPXRdLVrP+A7+gxkw/h7UW3E21DUqnESMGYnV2tyZC59XIVvxpXCyrwn+xrKVHdF0Dqwe2 90YlWlQ0zXGWKuO4sBhxsQ9J1bBET6IQiZOMdK2wVpT9v5+L1QDfKUsuvNiUuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658103890; a=rsa-sha256; cv=none; b=ZOwGfnxtViqfXa5IcVETv8KUnvjUEPbe5wnGa2NiSmKd/3FU9s3Mu8ARwnElVhp0MnkkhX LuZgdZLbNThKiqlpwL74NwKElX5NyWEWSo7HTieckZ0aG1K1GOK2uyjVfO4rea4GqDPThr kGECxemjFlDjpj5mjpzIR+D7c3sGzuw60gP/HVUMqIpsra0FdhIlsSRsMQ6eLPNN4GJqQV Q3oLRwnzi3dZBBQ4oEaeni2qfWSJHYJWdWr28Z+/bTPVHXekIQQBpKsDwfDReQDNiq1i8Y lF7pBGcvk/oB/gu+6adkFa00SeyhYJbwnp2/6XqN6Rj06nKgv8fhSw8ozlZYuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=1fbfa7a8dcd091e79754017cb543bab01fa6c157 commit 1fbfa7a8dcd091e79754017cb543bab01fa6c157 Author: Xin LI AuthorDate: 2022-07-18 00:24:31 +0000 Commit: Xin LI CommitDate: 2022-07-18 00:24:31 +0000 usr.bin/cksum: localize _total variables. --- usr.bin/cksum/crc.c | 2 +- usr.bin/cksum/crc32.c | 2 +- usr.bin/cksum/extern.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c index e110111084b7..b7285132e9b9 100644 --- a/usr.bin/cksum/crc.c +++ b/usr.bin/cksum/crc.c @@ -108,7 +108,7 @@ static const uint32_t crctab[] = { * locations to store the crc and the number of bytes read. It returns 0 on * success and 1 on failure. Errno is set on failure. */ -uint32_t crc_total = ~0; /* The crc over a number of files. */ +static uint32_t crc_total = ~0; /* The crc over a number of files. */ int crc(int fd, uint32_t *cval, off_t *clen) diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c index cadbc17b69bb..4389969716c3 100644 --- a/usr.bin/cksum/crc32.c +++ b/usr.bin/cksum/crc32.c @@ -95,7 +95,7 @@ static const uint32_t crctab[256] = { 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, }; -uint32_t crc32_total = 0; +static uint32_t crc32_total = 0; int crc32(int fd, uint32_t *cval, off_t *clen) diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h index 43a31db704c7..ce18531d0f13 100644 --- a/usr.bin/cksum/extern.h +++ b/usr.bin/cksum/extern.h @@ -34,9 +34,6 @@ #include -extern uint32_t crc_total; -extern uint32_t crc32_total; - __BEGIN_DECLS int crc(int, uint32_t *, off_t *); void pcrc(char *, uint32_t, off_t);