refactor

diff --git a/Utility/LockPool/LockHandle.hs b/Utility/LockPool/LockHandle.hs
index 1fa8e7ca7b6b40e9111c6131228189407ec7ff59..ec36e6156c943bccc245bdc8a477a17e86e95450 100644 (file)
--- a/Utility/LockPool/LockHandle.hs
+++ b/Utility/LockPool/LockHandle.hs
@@ -10,6 +10,7 @@
 module Utility.LockPool.LockHandle where
 
 import qualified Utility.LockPool.STM as P
+import Utility.LockPool.STM (LockFile)
 
 import Control.Concurrent.STM
 import Control.Exception
@@ -22,13 +23,18 @@ data LockHandle = LockHandle
 data FileLockOps = FileLockOps
        { fDropLock :: IO ()
 #ifndef mingw32_HOST_OS
-       , fCheckSaneLock :: FilePath -> IO Bool
+       , fCheckSaneLock :: LockFile -> IO Bool
 #endif
        }
 
 dropLock :: LockHandle -> IO ()
 dropLock h = P.releaseLock (poolHandle h) (fDropLock (fileLockOps h))
 
+#ifndef mingw32_HOST_OS
+checkSaneLock :: LockFile -> LockHandle -> IO Bool
+checkSaneLock lockfile (LockHandle _ flo) = fCheckSaneLock flo lockfile
+#endif
+
 -- Take a lock, by first updating the lock pool, and then taking the file
 -- lock. If taking the file lock fails for any reason, take care to
 -- release the lock in the lock pool.

diff --git a/Utility/LockPool/PidLock.hs b/Utility/LockPool/PidLock.hs
index 3d90e4b42dcc2000669621d23e34618d4a3d9325..dc796b961d483ae4a83d19b552cebf985849d4a4 100644 (file)
--- a/Utility/LockPool/PidLock.hs
+++ b/Utility/LockPool/PidLock.hs
@@ -53,9 +53,6 @@ getLockStatus file = P.getLockStatus P.lockPool file
        (StatusLockedBy <$> getProcessID)
        (F.getLockStatus file)
 
-checkSaneLock :: LockFile -> LockHandle -> IO Bool
-checkSaneLock lockfile (LockHandle _ flo) = fCheckSaneLock flo lockfile
-
 mk :: F.LockHandle -> FileLockOps
 mk h = FileLockOps
        { fDropLock = F.dropLock h

diff --git a/Utility/LockPool/Posix.hs b/Utility/LockPool/Posix.hs
index eb679b7e8901a36b3634feeebc3f68487ea7e29b..a77ed8f01b12dd155dcf3b81d737a3ee0721f213 100644 (file)
--- a/Utility/LockPool/Posix.hs
+++ b/Utility/LockPool/Posix.hs
@@ -67,9 +67,6 @@ getLockStatus file = P.getLockStatus P.lockPool file
        (StatusLockedBy <$> getProcessID)
        (F.getLockStatus file)
 
-checkSaneLock :: LockFile -> LockHandle -> IO Bool
-checkSaneLock lockfile (LockHandle _ flo) = fCheckSaneLock flo lockfile
-
 mk :: F.LockHandle -> FileLockOps
 mk h = FileLockOps
        { fDropLock = F.dropLock h