writepid is now a static inline function

diff --git a/common.c b/common.c
index 2710020557dcc7551e4cd8f9236420033b118582..02ea4ae0a502a2245c783f7c3e6d7052a0f4f16c 100644 (file)
--- a/common.c
+++ b/common.c
@@ -224,17 +224,3 @@ uptime(void)
        return tv.tv_sec;
 }
 
-int
-writepid(int fd, pid_t pid)
-{
-       char spid[16];
-       ssize_t len;
-
-       if (ftruncate(fd, (off_t)0) == -1)
-               return -1;
-       snprintf(spid, sizeof(spid), "%u\n", pid);
-       len = pwrite(fd, spid, strlen(spid), (off_t)0);
-       if (len != (ssize_t)strlen(spid))
-               return -1;
-       return 0;
-}

diff --git a/common.h b/common.h
index 2cea3151da06f323f73c19a57cd7a6dc4326d871..cf2d37b2bd583b6e0896535033f5d54305bff117 100644 (file)
--- a/common.h
+++ b/common.h
@@ -107,6 +107,5 @@ int get_monotonic(struct timeval *);
 ssize_t setvar(char ***, const char *, const char *, const char *);
 ssize_t setvard(char ***, const char *, const char *, int);
 time_t uptime(void);
-int writepid(int, pid_t);
 
 #endif

diff --git a/dhcpcd.c b/dhcpcd.c
index 669f359f31b324b2b9f37f53f42dc6b5a9052b1a..33d2f83561d2b6b0fc0f0d2547b33919b1818c8a 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -186,6 +186,15 @@ handle_exit_timeout(__unused void *arg)
        eloop_timeout_add_sec(timeout, handle_exit_timeout, NULL);
 }
 
+static inline int
+writepid(int fd, pid_t pid)
+{
+
+       if (ftruncate(fd, (off_t)0) == -1)
+               return -1;
+       return dprintf(fd, "%d\n", pid);
+}
+
 /* Returns the pid of the child, otherwise 0. */
 pid_t
 daemonise(void)