From nobody Tue Apr 18 18:31:37 2023 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 4Q1CDp0R4Nz45Tgb; Tue, 18 Apr 2023 18:31:38 +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 4Q1CDn5NsYz4205; Tue, 18 Apr 2023 18:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681842697; 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=L5LLWyv//wOGdE7RdkHC+inmaYH6lmQ83hNDULG5TlE=; b=RuqsOYk6EepSDDA6ut+i2NJGBGqkDPRt7Ry2i7By7BeMhaYI8pmqbmVrWAD/P+DjT/Uq3E rhl8RGqN/jk/vsa5RQ4JqsEJsJIZh5cWN+IpZ9MZV3fghTQuOo+T31KlTCIT2J9Xor8SwM 52hvMLI9Pr9+/Mu80Ync8RszSzLv7B8IZ6DErjSEPJS0FBK6u6GaPn3qFLSDPDX/BPdMKn mbWdef/KYuucTY5RqbhMWeMBnqvhgaFc09DCRNKjOL3uY7fEab4KGGteYBDcO2H/96fKx6 Nb8seqLSOGHKtRuduDdkqssV1OoPQoZAdqHSdkMqNoKxauHXdKtGrWXL9ZQlNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681842697; 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=L5LLWyv//wOGdE7RdkHC+inmaYH6lmQ83hNDULG5TlE=; b=iXMGZ1srYZImOgFzOW0yT1FqMxrCHeDQDeHdNdb4aePvAGsAI+zVTw8Fdx0eVnk66G5dQ+ s2LOk3JKXLH84TbTS2o70zPsnRpANHNJMkRWROdTsX0vLthn4AWZkyxfB/olnpDPQn6V53 6Ca4YyLL/txRWLe3srC2bGAe4DLMheLAbkeKy0HwinELIjmMARXjiSqopSVXQiQWzm3nOp C16iIdnITv+JTyi2H8oeaUGjyNWc92ufl1Wq2u3z7ZHZhe2jw5NubINDv8UpfKb7fLfTFr i6GNh0xnqMyROedIh0QqShU/BG3mDEBPZNJUzN0cUx+ysH8aMj+TfhKqn0YhTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681842697; a=rsa-sha256; cv=none; b=QJc17WmlWGD66NuMww2QodRw9yAzhfVhBYZNmvp6bLu8pDA+LpVaX9I4EEuUDfzi9VBP3O wz7hUj278lSo5TTouVstXuGTSjA+i5GRwvvHFocGIap+XvuyMuymtJ8hQwCDdjy+E4lpst Eun4gg0YA29JhJC3unOejr/d258Y7lYNDlspGTtuwu44Bq1uEvCU6ZDE8mN4HXW+NpUkRj khYBz+V8VD9gTS3FVEgRIAuLDCReeRdVnwhwQKzi7t11sKeEHW3wb8SO6VCqWllygeoQcE ArePwkf6Rkeclw83bAJY6uGvhjGYDZ5v/mb6VJEPjjTpwHrKnxmm+WakkjQXWg== 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 4Q1CDn3HY9zNQk; Tue, 18 Apr 2023 18:31:37 +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 33IIVboH028418; Tue, 18 Apr 2023 18:31:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33IIVbgU028417; Tue, 18 Apr 2023 18:31:37 GMT (envelope-from git) Date: Tue, 18 Apr 2023 18:31:37 GMT Message-Id: <202304181831.33IIVbgU028417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2541accb7973 - main - rpc.lockd: Use C89 function definitions. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2541accb79733355bc255c71796a92a219f1cb1f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2541accb79733355bc255c71796a92a219f1cb1f commit 2541accb79733355bc255c71796a92a219f1cb1f Author: John Baldwin AuthorDate: 2023-04-18 18:28:24 +0000 Commit: John Baldwin CommitDate: 2023-04-18 18:28:24 +0000 rpc.lockd: Use C89 function definitions. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39530 --- usr.sbin/rpc.lockd/lockd_lock.c | 52 +++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c index 1fc4ce23597a..66ac74bf0cd2 100644 --- a/usr.sbin/rpc.lockd/lockd_lock.c +++ b/usr.sbin/rpc.lockd/lockd_lock.c @@ -235,13 +235,9 @@ debuglog(char const *fmt, ...) } void -dump_static_object(object, size_object, hbuff, size_hbuff, cbuff, size_cbuff) - const unsigned char *object; - const int size_object; - unsigned char *hbuff; - const int size_hbuff; - unsigned char *cbuff; - const int size_cbuff; +dump_static_object(const unsigned char *object, const int size_object, + unsigned char *hbuff, const int size_hbuff, unsigned char *cbuff, + const int size_cbuff) { int i, objectsize; @@ -358,10 +354,8 @@ dump_filelock(const struct file_lock *fl) } void -copy_nlm4_lock_to_nlm4_holder(src, exclusive, dest) - const struct nlm4_lock *src; - const bool_t exclusive; - struct nlm4_holder *dest; +copy_nlm4_lock_to_nlm4_holder(const struct nlm4_lock *src, + const bool_t exclusive, struct nlm4_holder *dest) { dest->exclusive = exclusive; @@ -465,8 +459,8 @@ deallocate_file_lock(struct file_lock *fl) * overlap. */ int -regions_overlap(start1, len1, start2, len2) - const u_int64_t start1, len1, start2, len2; +regions_overlap(const u_int64_t start1, const u_int64_t len1, + const u_int64_t start2, const u_int64_t len2) { u_int64_t d1,d2,d3,d4; enum split_status result; @@ -494,10 +488,9 @@ regions_overlap(start1, len1, start2, len2) * XXX: This DESPERATELY needs a regression test. */ enum split_status -region_compare(starte, lene, startu, lenu, - start1, len1, start2, len2) - const u_int64_t starte, lene, startu, lenu; - u_int64_t *start1, *len1, *start2, *len2; +region_compare(const u_int64_t starte, const u_int64_t lene, + const u_int64_t startu, const u_int64_t lenu, u_int64_t *start1, + u_int64_t *len1, u_int64_t *start2, u_int64_t *len2) { /* * Please pay attention to the sequential exclusions @@ -680,8 +673,7 @@ same_netobj(const netobj *n0, const netobj *n1) * same_filelock_identity: Compares the appropriate bits of a file_lock */ int -same_filelock_identity(fl0, fl1) - const struct file_lock *fl0, *fl1; +same_filelock_identity(const struct file_lock *fl0, const struct file_lock *fl1) { int retval; @@ -919,9 +911,9 @@ delete_nfslock(struct file_lock *fl) } enum split_status -split_nfslock(exist_lock, unlock_lock, left_lock, right_lock) - const struct file_lock *exist_lock, *unlock_lock; - struct file_lock **left_lock, **right_lock; +split_nfslock(const struct file_lock *exist_lock, + const struct file_lock *unlock_lock, struct file_lock **left_lock, + struct file_lock **right_lock) { u_int64_t start1, len1, start2, len2; enum split_status spstatus; @@ -965,11 +957,8 @@ split_nfslock(exist_lock, unlock_lock, left_lock, right_lock) } enum nfslock_status -unlock_nfslock(fl, released_lock, left_lock, right_lock) - const struct file_lock *fl; - struct file_lock **released_lock; - struct file_lock **left_lock; - struct file_lock **right_lock; +unlock_nfslock(const struct file_lock *fl, struct file_lock **released_lock, + struct file_lock **left_lock, struct file_lock **right_lock) { struct file_lock *mfl; /* Matching file lock */ enum nfslock_status retval; @@ -1164,9 +1153,8 @@ unlock_hwlock(const struct file_lock *fl) } enum hwlock_status -test_hwlock(fl, conflicting_fl) - const struct file_lock *fl __unused; - struct file_lock **conflicting_fl __unused; +test_hwlock(const struct file_lock *fl __unused, + struct file_lock **conflicting_fl __unused) { /* @@ -2176,9 +2164,7 @@ notify(const char *hostname, const int state) } void -send_granted(fl, opcode) - struct file_lock *fl; - int opcode __unused; +send_granted(struct file_lock *fl, int opcode __unused) { CLIENT *cli; static char dummy;