X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Flock_file.c;h=983d9d70d437ad6b6365f0c37bc3a65e6c32c003;hb=768b5edd9623b7238e12ec8dfc409b82a1ed9e2d;hp=34d743e5414bbf475a2ea081c41176cef7f17897;hpb=714b5c530ece27ea2835a313013f5b770163403c;p=mmh

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 34d743e..983d9d7 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -30,9 +30,7 @@
 # endif
 #endif
 
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
+#include <errno.h>
 
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
@@ -107,11 +105,11 @@ static void lockname(char *, struct lockinfo *, int);
 static void timerON(char *, int);
 static void timerOFF(int);
 static RETSIGTYPE alrmser(int);
-#endif
 
 #if !defined(HAVE_LIBLOCKFILE)
 static int lockit(struct lockinfo *);
 #endif
+#endif
 
 /*
 ** Base routine to open and lock a file,
@@ -479,10 +477,6 @@ lockname(char *file, struct lockinfo *li, int isnewlock)
 	int bplen, tmplen;
 	char *bp, *cp;
 
-#if 0
-	struct stat st;
-#endif
-
 	if ((cp = strrchr(file, '/')) == NULL || *++cp == 0)
 		cp = file;
 
@@ -502,19 +496,6 @@ lockname(char *file, struct lockinfo *li, int isnewlock)
 	}
 #endif
 
-#if 0
-	/*
-	** mmdf style dot locking.  Currently not supported.
-	** If we start supporting mmdf style dot locking,
-	** we will need to change the return value of lockname
-	*/
-	if (stat(file, &st) == -1)
-		return -1;
-
-	snprintf(bp, sizeof(li->curlock) - bplen, "LCK%05d.%05d",
-		st.st_dev, st.st_ino);
-#endif
-
 	snprintf(bp, sizeof(li->curlock) - bplen, "%s.lock", cp);
 
 #if !defined(HAVE_LIBLOCKFILE)