From 6da7f3783bfa978cfbf1d4bd286993d2db039a0a Mon Sep 17 00:00:00 2001 From: Philippe Charnier Date: Thu, 19 Jun 1997 14:40:41 +0000 Subject: [PATCH] Use warn(3). --- sbin/swapon/swapon.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index d2eebed4b8e1..eb7e643d39fc 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -29,6 +29,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $Id$ */ #ifndef lint @@ -46,8 +48,10 @@ static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93"; #include #include #include +#include +#include -void usage __P((void)); +static void usage __P((void)); int add __P((char *name, int ignoreebusy)); int @@ -100,13 +104,10 @@ add(char *name, int ignoreebusy) switch (errno) { case EBUSY: if (!ignoreebusy) - fprintf(stderr, - "swapon: %s: device already in use\n", - name); + warnx("%s: device already in use", name); break; default: - fprintf(stderr, "swapon: %s: ", name); - perror((char *)NULL); + warn("%s", name); break; } return(1); @@ -114,7 +115,7 @@ add(char *name, int ignoreebusy) return(0); } -void +static void usage() { fprintf(stderr, "usage: swapon [-a] [special_file ...]\n");