diff options
| -rw-r--r-- | source3/locking/locking.c | 12 | ||||
| -rw-r--r-- | source3/locking/proto.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 7e65616d40..602c30dfa2 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -634,24 +634,24 @@ bool is_valid_share_mode_entry(const struct share_mode_entry *e) * from d->share_modes. Modifies d->num_share_modes, watch out in * routines iterating over that array. */ -bool share_mode_stale_pid(struct share_mode_data *d, unsigned i) +bool share_mode_stale_pid(struct share_mode_data *d, unsigned idx) { struct share_mode_entry *e; - if (i > d->num_share_modes) { + if (idx > d->num_share_modes) { DEBUG(1, ("Asking for index %u, only %u around\n", - i, (unsigned)d->num_share_modes)); + idx, (unsigned)d->num_share_modes)); return false; } - e = &d->share_modes[i]; + e = &d->share_modes[idx]; if (serverid_exists(&e->pid)) { DEBUG(10, ("PID %s (index %u out of %u) still exists\n", - procid_str_static(&e->pid), i, + procid_str_static(&e->pid), idx, (unsigned)d->num_share_modes)); return false; } DEBUG(10, ("PID %s (index %u out of %u) does not exist anymore\n", - procid_str_static(&e->pid), i, + procid_str_static(&e->pid), idx, (unsigned)d->num_share_modes)); *e = d->share_modes[d->num_share_modes-1]; d->num_share_modes -= 1; diff --git a/source3/locking/proto.h b/source3/locking/proto.h index adb30b7a55..93fbea5203 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -170,7 +170,7 @@ void get_file_infos(struct file_id id, bool *delete_on_close, struct timespec *write_time); bool is_valid_share_mode_entry(const struct share_mode_entry *e); -bool share_mode_stale_pid(struct share_mode_data *d, unsigned i); +bool share_mode_stale_pid(struct share_mode_data *d, unsigned idx); void set_share_mode(struct share_mode_lock *lck, files_struct *fsp, uid_t uid, uint64_t mid, uint16 op_type); bool del_share_mode(struct share_mode_lock *lck, files_struct *fsp); |