diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-16 06:40:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-16 06:40:24 +0000 |
| commit | 315054f4737a39489e0a14f3a92bff61f1592832 (patch) | |
| tree | 62bf010653374ce09b6beb4dfa0414a91457233b /usr.bin/cdio/cddb.c | |
| parent | 79e3d817585ca08a91e30ad14abe43e2ab70295f (diff) | |
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'usr.bin/cdio/cddb.c')
| -rw-r--r-- | usr.bin/cdio/cddb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cdio/cddb.c b/usr.bin/cdio/cddb.c index bc3e010aab7..c5ae468db5a 100644 --- a/usr.bin/cdio/cddb.c +++ b/usr.bin/cdio/cddb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cddb.c,v 1.19 2014/01/06 12:38:10 espie Exp $ */ +/* $OpenBSD: cddb.c,v 1.20 2015/01/16 06:40:06 deraadt Exp $ */ /* * Copyright (c) 2002 Marc Espie. * @@ -24,7 +24,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> #include <sys/cdio.h> @@ -34,6 +33,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <limits.h> #include <vis.h> #include "extern.h" @@ -76,7 +76,7 @@ cddb_discid(int n, struct cd_toc_entry *e) void send_hello(FILE *cout) { - char hostname[MAXHOSTNAMELEN]; + char hostname[HOST_NAME_MAX+1]; if (gethostname(hostname, sizeof(hostname)) == -1) strlcpy(hostname, "unknown", sizeof hostname); |