summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-15 02:36:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-15 02:36:24 -0400
commitbca68c263da765acedad5643a37f09f142555683 (patch)
tree55fc3008565f92c034e540c523a3dc5272dd005e
parent199ffa6c36178ac7360ad957feccba188e0dad02 (diff)
tweaks
-rw-r--r--Touch.hsc18
1 files changed, 9 insertions, 9 deletions
diff --git a/Touch.hsc b/Touch.hsc
index 4e1052b94..34b34be51 100644
--- a/Touch.hsc
+++ b/Touch.hsc
@@ -9,8 +9,8 @@
module Touch (
TimeSpec(..),
- now,
- omit,
+ nowTime,
+ omitTime,
touchBoth,
touch
) where
@@ -28,8 +28,8 @@ instance Storable TimeSpec where
-- use the larger alignment of the two types in the struct
alignment _ = max sec_alignment nsec_alignment
where
- sec_alignment = alignment $ undefined::CTime
- nsec_alignment = alignment $ undefined::CLong
+ sec_alignment = alignment (undefined::CTime)
+ nsec_alignment = alignment (undefined::CLong)
sizeOf _ = #{size struct timespec}
peek ptr = do
sec <- #{peek struct timespec, tv_sec} ptr
@@ -40,10 +40,10 @@ instance Storable TimeSpec where
#{poke struct timespec, tv_nsec} ptr nsec
{- special timespecs -}
-omit :: TimeSpec
-omit = TimeSpec 0 #const UTIME_OMIT
-now :: TimeSpec
-now = TimeSpec 0 #const UTIME_NOW
+omitTime :: TimeSpec
+omitTime = TimeSpec 0 #const UTIME_OMIT
+nowTime :: TimeSpec
+nowTime = TimeSpec 0 #const UTIME_NOW
{- While its interface is beastly, utimensat is in recent
POSIX standards, unlike futimes. -}
@@ -68,4 +68,4 @@ touchBoth file atime mtime follow =
else at_symlink_nofollow
touch :: FilePath -> TimeSpec -> Bool -> IO Bool
-touch file mtime follow = touchBoth file omit mtime follow
+touch file mtime follow = touchBoth file omitTime mtime follow