lockfile: Remove fd parameter to remove_lockfile().

There is no reason that remove_lockfile() should close a fd passed in to
it.  The caller can do that just as well.

diff --git a/lib/cfg.c b/lib/cfg.c
index 29bc495be13b6f39117dc9a5a4bc3168fcdd2843..ee5cf6fb519f49a5e3e41ffba637868a83b987d9 100644 (file)
--- a/lib/cfg.c
+++ b/lib/cfg.c
@@ -253,7 +253,10 @@ cfg_get_cookie(uint8_t *cookie)
 void
 cfg_unlock(void)
 {
-    remove_lockfile(lock_fd, lock_name);
+    if (lock_fd != -1) {
+        close(lock_fd);
+    }
+    remove_lockfile(lock_name);
     lock_fd = -1;
 }
 

diff --git a/lib/lockfile.c b/lib/lockfile.c
index 736a67c56f2f656f4996cd4d5424e222974db437..d98e97a5ae8f3ad6c8bf0a907c7081ede69ad7bd 100644 (file)
--- a/lib/lockfile.c
+++ b/lib/lockfile.c
@@ -28,18 +28,14 @@ fcntl_lock(int fd)
     return fcntl(fd, F_SETLK, &l) == -1 ? errno : 0;
 }
 
-/* Remove the lockfile with 'name'.  If the 'fd' argument is not -1, it
- * will be closed. */
+/* Remove the lockfile with 'name'. */
 int
-remove_lockfile(int fd, const char *name)
+remove_lockfile(const char *name)
 {
     char buffer[BUFSIZ];
     ssize_t n;
     pid_t pid;
-
-    if (fd != -1) {
-        close(fd);
-    }
+    int fd;
 
     /* Remove existing lockfile. */
     fd = open(name, O_RDWR);
@@ -118,7 +114,7 @@ create_lockfile(const char *name)
     int fd;
 
     /* Remove an existing lockfile if it was created by us. */
-    int retval = remove_lockfile(-1, name);
+    int retval = remove_lockfile(name);
     if (!retval) {
         return retval;
     }

diff --git a/lib/lockfile.h b/lib/lockfile.h
index 645fd3d9d853133c57a6f02839227aa8f03feeed..8e01c8f6109682096262d59767d29d8dfd5a69d9 100644 (file)
--- a/lib/lockfile.h
+++ b/lib/lockfile.h
@@ -35,6 +35,6 @@
 #define LOCKFILE_H 1
 
 int create_lockfile(const char *name);
-int remove_lockfile(int fd, const char *name);
+int remove_lockfile(const char *name);
 
 #endif /* lockfile.h */