projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix burst so it actually complies with RFC 934. This means discarding
[mmh]
/
sbr
/
lock_file.c
diff --git
a/sbr/lock_file.c
b/sbr/lock_file.c
index
c4353b5
..
af9b16d
100644
(file)
--- a/
sbr/lock_file.c
+++ b/
sbr/lock_file.c
@@
-19,16
+19,10
@@
#include <h/signals.h>
#include <h/utils.h>
#include <h/signals.h>
#include <h/utils.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
#endif
+#include <time.h>
#include <errno.h>
#ifdef HAVE_FCNTL_H
#include <errno.h>
#ifdef HAVE_FCNTL_H
@@
-173,6
+167,8
@@
lkclose (int fd, char *file)
lockfile_remove(lkinfo.curlock);
#endif /* HAVE_LIBLOCKFILE */
timerOFF (fd); /* turn off lock timer */
lockfile_remove(lkinfo.curlock);
#endif /* HAVE_LIBLOCKFILE */
timerOFF (fd); /* turn off lock timer */
+#else /* DOT_LOCKING */
+ NMH_UNUSED (file);
#endif /* DOT_LOCKING */
return (close (fd));
#endif /* DOT_LOCKING */
return (close (fd));
@@
-264,6
+260,8
@@
lkfclose (FILE *fp, char *file)
lockfile_remove(lkinfo.curlock);
#endif /* HAVE_LIBLOCKFILE */
timerOFF (fileno(fp)); /* turn off lock timer */
lockfile_remove(lkinfo.curlock);
#endif /* HAVE_LIBLOCKFILE */
timerOFF (fileno(fp)); /* turn off lock timer */
+#else /* DOT_LOCKING */
+ NMH_UNUSED (file);
#endif /* DOT_LOCKING */
return (fclose (fp));
#endif /* DOT_LOCKING */
return (fclose (fp));
@@
-588,6
+586,8
@@
timerOFF (int fd)
static void
alrmser (int sig)
{
static void
alrmser (int sig)
{
+ NMH_UNUSED (sig);
+
char *lockfile;
struct lock *lp;
char *lockfile;
struct lock *lp;