summaryrefslogtreecommitdiff
path: root/src/libstddjb/lock_shnb.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-02-21 12:05:07 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-02-21 12:05:07 +0000
commit49d8fa1058aaf23c29e074b2314492ae40d2f557 (patch)
tree393f884d5a99f984e992a0f35f1b02ac43536217 /src/libstddjb/lock_shnb.c
parentfdffefb8032922ce7ffe4c00816072a8ff2148fc (diff)
downloadskalibs-49d8fa1058aaf23c29e074b2314492ae40d2f557.tar.xz
Types change: big pass on libstddjb and libunixonacid
libdatastruct still missing, library still not functional
Diffstat (limited to 'src/libstddjb/lock_shnb.c')
-rw-r--r--src/libstddjb/lock_shnb.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libstddjb/lock_shnb.c b/src/libstddjb/lock_shnb.c
index 6a8fd42..40c988d 100644
--- a/src/libstddjb/lock_shnb.c
+++ b/src/libstddjb/lock_shnb.c
@@ -11,25 +11,22 @@
int lock_shnb (int fd)
{
- register int r ;
- do
- r = flock(fd, LOCK_SH | LOCK_NB) ;
+ int r ;
+ do r = flock(fd, LOCK_SH | LOCK_NB) ;
while ((r == -1) && (errno == EINTR)) ;
return r ;
}
#else
-#include <sys/types.h>
#include <unistd.h>
#include <errno.h>
#include <skalibs/djbunix.h>
int lock_shnb (int fd)
{
- register int r ;
- do
- r = lockf(fd, F_TLOCK, 0) ;
+ int r ;
+ do r = lockf(fd, F_TLOCK, 0) ;
while ((r == -1) && (errno == EINTR)) ;
if ((r == -1) && (errno == EACCES)) errno = EAGAIN ;
return r ;