Moved #endif so that lockit () is only declared with DOT_LOCKING,

[mmh] / sbr / lock_file.c

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 34d743e..b4a1547 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -107,11 +107,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 +479,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 +498,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)