diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-08-08 09:56:38 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:34 -0500 |
| commit | e4b8c79a9d6f7323953121887af4f482d04a9228 (patch) | |
| tree | e8d6aafe0e65899ac2f15025b3955ed979565a58 /source/locking/brlock.c | |
| parent | 873a5a1211d185fd50e7167d88cbc869f70dfd3f (diff) | |
| download | samba-e4b8c79a9d6f7323953121887af4f482d04a9228.tar.gz samba-e4b8c79a9d6f7323953121887af4f482d04a9228.tar.xz samba-e4b8c79a9d6f7323953121887af4f482d04a9228.zip | |
r17452: Some C++ warnings
Diffstat (limited to 'source/locking/brlock.c')
| -rw-r--r-- | source/locking/brlock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/locking/brlock.c b/source/locking/brlock.c index fd41f75e625..9229d6e6e8a 100644 --- a/source/locking/brlock.c +++ b/source/locking/brlock.c @@ -1002,7 +1002,8 @@ static BOOL brl_unlock_posix(struct byte_range_lock *br_lck, const struct lock_s br_lck->num_locks = count; SAFE_FREE(br_lck->lock_data); - locks = br_lck->lock_data = (void *)tp; + locks = tp; + br_lck->lock_data = (void *)tp; br_lck->modified = True; /* Send unlock messages to any pending waiters that overlap. */ @@ -1279,7 +1280,7 @@ void brl_close_fnum(struct byte_range_lock *br_lck) unsigned int num_locks_copy; /* Copy the current lock array. */ - locks_copy = TALLOC_MEMDUP(br_lck, locks, br_lck->num_locks * sizeof(struct lock_struct)); + locks_copy = (struct lock_struct *)TALLOC_MEMDUP(br_lck, locks, br_lck->num_locks * sizeof(struct lock_struct)); if (!locks_copy) { smb_panic("brl_close_fnum: talloc fail.\n"); } |