Module Name: src
Committed By: abhinav
Date: Sat May 21 17:21:40 UTC 2016
Modified Files:
src/usr.bin/man: man.c pathnames.h
Log Message:
Remove unused include and unused constant. Ok from christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/man/man.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/man/pathnames.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/man/man.c
diff -u src/usr.bin/man/man.c:1.62 src/usr.bin/man/man.c:1.63
--- src/usr.bin/man/man.c:1.62 Thu Aug 14 15:31:12 2014
+++ src/usr.bin/man/man.c Sat May 21 17:21:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: man.c,v 1.62 2014/08/14 15:31:12 apb Exp $ */
+/* $NetBSD: man.c,v 1.63 2016/05/21 17:21:40 abhinav Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
-__RCSID("$NetBSD: man.c,v 1.62 2014/08/14 15:31:12 apb Exp $");
+__RCSID("$NetBSD: man.c,v 1.63 2016/05/21 17:21:40 abhinav Exp $");
#endif
#endif /* not lint */
@@ -51,7 +51,6 @@ __RCSID("$NetBSD: man.c,v 1.62 2014/08/1
#include <ctype.h>
#include <err.h>
-#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
#include <glob.h>
@@ -160,7 +159,8 @@ main(int argc, char **argv)
break;
case 'M':
case 'P': /* -P for backward compatibility */
- m.manpath = strdup(optarg);
+ if ((m.manpath = strdup(optarg)) == NULL)
+ err(EXIT_FAILURE, "malloc failed");
break;
case 'p':
m.getpath = 1;
Index: src/usr.bin/man/pathnames.h
diff -u src/usr.bin/man/pathnames.h:1.5 src/usr.bin/man/pathnames.h:1.6
--- src/usr.bin/man/pathnames.h:1.5 Thu Aug 7 11:15:11 2003
+++ src/usr.bin/man/pathnames.h Sat May 21 17:21:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.5 2003/08/07 11:15:11 agc Exp $ */
+/* $NetBSD: pathnames.h,v 1.6 2016/05/21 17:21:40 abhinav Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,5 +35,4 @@
#define _PATH_MANCONF "/etc/man.conf"
#define _PATH_PAGER "/usr/bin/more -s"
-#define _PATH_WHATIS "whatis.db"
#define TMPFILE "man.XXXXXX"
