JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* flock.cc (inode_t::unlock_and_remove_if_unused): Rename from 

unlock_and_remove.
This commit is contained in:
Corinna Vinschen 2011-08-31 16:35:19 +00:00
parent 2e560a092c
commit 52a5f8cc1a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-31 Corinna Vinschen <corinna@vinschen.de>
* flock.cc (inode_t::unlock_and_remove_if_unused): Rename from
unlock_and_remove.
2011-08-29 Corinna Vinschen <corinna@vinschen.de>
* flock.cc (LOCK_OBJ_NAME_LEN): Change to accommodate extra lf_ver

12
winsup/cygwin/flock.cc
View File

@ -312,7 +312,7 @@ class inode_t
void notused () { i_cnt = 0; }
void unlock_and_remove ();
void unlock_and_remove_if_unused ();
lockf_t *get_all_locks_list ();
@ -329,7 +329,7 @@ inode_t::~inode_t ()
}
void
inode_t::unlock_and_remove ()
inode_t::unlock_and_remove_if_unused ()
{
UNLOCK ();
INODE_LIST_LOCK ();
@ -400,7 +400,7 @@ fhandler_base::del_my_locks (del_lock_called_from from)
lock event would be premature. */
node->del_my_locks (from == after_fork ? 0 : get_unique_id (),
from == after_exec ? NULL : get_handle ());
node->unlock_and_remove ();
node->unlock_and_remove_if_unused ();
}
}
@ -851,7 +851,7 @@ restart: /* Entry point after a restartable signal came in. */
clean = new lockf_t ();
if (!clean)
{
node->unlock_and_remove ();
node->unlock_and_remove_if_unused ();
set_errno (ENOLCK);
return -1;
}
@ -865,7 +865,7 @@ restart: /* Entry point after a restartable signal came in. */
myself->dwProcessId, 0);
if (!lock)
{
node->unlock_and_remove ();
node->unlock_and_remove_if_unused ();
set_errno (ENOLCK);
return -1;
}
@ -901,7 +901,7 @@ restart: /* Entry point after a restartable signal came in. */
delete lock;
lock = n;
}
node->unlock_and_remove ();
node->unlock_and_remove_if_unused ();
switch (error)
{
case 0: /* All is well. */