Page MenuHomeFreeBSD
Files F97749080

D39530.diff
No OneTemporary
Actions

D39530.diff
View Options

diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -235,13 +235,9 @@
}
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 @@
}
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 @@
* 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 @@
* 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_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 @@
}
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 @@
}
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 @@
}
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 @@
}
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;

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 2, 2:28 AM (21 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13297837
Default Alt Text
D39530.diff (3 KB)

Event Timeline