From 4a25aa061a2afec2af21caa4f2187d8544b2ea18 Mon Sep 17 00:00:00 2001 From: Guy Helmer Date: Tue, 10 Jan 2012 21:47:58 +0000 Subject: [PATCH] Style fixes courtesy of pjd. --- lib/libutil/pidfile.3 | 6 ++++-- lib/libutil/pidfile.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/libutil/pidfile.3 b/lib/libutil/pidfile.3 index e11276f0d26..c224a9b6fde 100644 --- a/lib/libutil/pidfile.3 +++ b/lib/libutil/pidfile.3 @@ -100,7 +100,7 @@ function closes and removes a pidfile. .Pp The .Fn pidfile_fileno -function returns the file descriptor for the open pid file. +function returns the file descriptor for the open pidfile. .Sh RETURN VALUES The .Fn pidfile_open @@ -118,7 +118,9 @@ will be set. The .Fn pidfile_fileno function returns the low-level file descriptor. -It returns -1 and sets +It returns +.Li -1 +and sets .Va errno if a NULL .Vt pidfh diff --git a/lib/libutil/pidfile.c b/lib/libutil/pidfile.c index cf5accebe3b..6bfa3767058 100644 --- a/lib/libutil/pidfile.c +++ b/lib/libutil/pidfile.c @@ -270,6 +270,7 @@ pidfile_remove(struct pidfh *pfh) int pidfile_fileno(struct pidfh *pfh) { + if (pfh == NULL || pfh->pf_fd == -1) { errno = EDOOFUS; return (-1);