summary refs log tree commit diff
path: root/src/libstddjb/lock_shnb.c
diff options
context:
space:
mode:
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 ;