Merge of r4738: struct flock initialization.

Made sure to initialize the entire "struct flock" allocated on stack.
This commit is contained in:
Maxim Dounin 2012-08-06 15:31:49 +00:00
parent e119c8f3cf
commit 5fa264d72a
1 changed files with 3 additions and 9 deletions

View File

@ -413,9 +413,7 @@ ngx_trylock_fd(ngx_fd_t fd)
{
struct flock fl;
fl.l_start = 0;
fl.l_len = 0;
fl.l_pid = 0;
ngx_memzero(&fl, sizeof(struct flock));
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
@ -432,9 +430,7 @@ ngx_lock_fd(ngx_fd_t fd)
{
struct flock fl;
fl.l_start = 0;
fl.l_len = 0;
fl.l_pid = 0;
ngx_memzero(&fl, sizeof(struct flock));
fl.l_type = F_WRLCK;
fl.l_whence = SEEK_SET;
@ -451,9 +447,7 @@ ngx_unlock_fd(ngx_fd_t fd)
{
struct flock fl;
fl.l_start = 0;
fl.l_len = 0;
fl.l_pid = 0;
ngx_memzero(&fl, sizeof(struct flock));
fl.l_type = F_UNLCK;
fl.l_whence = SEEK_SET;