Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixes for non-literal strings 

- add missing strbuf initialization
This commit is contained in:
christos 2011-08-16 04:45:17 +00:00
parent f5342d4e22
commit afec221346
6 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/bsd/ntp/dist/lib/isc/log.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: log.c,v 1.1.1.1 2009/12/13 16:54:22 kardel Exp $ */ /* $NetBSD: log.c,v 1.2 2011/08/16 04:45:17 christos Exp $ */
/* /*
* Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007, 2009 Internet Systems Consortium, Inc. ("ISC")
@ -1520,10 +1520,11 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
level_string[0] == '\0') { level_string[0] == '\0') {
if (level < ISC_LOG_CRITICAL) if (level < ISC_LOG_CRITICAL)
snprintf(level_string, sizeof(level_string), snprintf(level_string, sizeof(level_string),
"%s %d: ",
isc_msgcat_get(isc_msgcat, isc_msgcat_get(isc_msgcat,
ISC_MSGSET_LOG, ISC_MSGSET_LOG,
ISC_MSG_LEVEL, ISC_MSG_LEVEL,
"level %d: "), "level"),
level); level);
else if (level > ISC_LOG_DYNAMIC) else if (level > ISC_LOG_DYNAMIC)
snprintf(level_string, sizeof(level_string), snprintf(level_string, sizeof(level_string),

5
external/bsd/ntp/dist/lib/isc/netaddr.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: netaddr.c,v 1.1.1.1 2009/12/13 16:54:13 kardel Exp $ */ /* $NetBSD: netaddr.c,v 1.2 2011/08/16 04:45:17 christos Exp $ */
/* /*
* Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC")
@ -202,9 +202,10 @@ isc_netaddr_format(const isc_netaddr_t *na, char *array, unsigned int size) {
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
snprintf(array, size, snprintf(array, size,
"<%s %u>",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_NETADDR, isc_msgcat_get(isc_msgcat, ISC_MSGSET_NETADDR,
ISC_MSG_UNKNOWNADDR, ISC_MSG_UNKNOWNADDR,
"<unknown address, family %u>"), "unknown address, family"),
na->family); na->family);
array[size - 1] = '\0'; array[size - 1] = '\0';
} }

14
external/bsd/ntp/dist/lib/isc/sockaddr.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: sockaddr.c,v 1.1.1.1 2009/12/13 16:54:14 kardel Exp $ */ /* $NetBSD: sockaddr.c,v 1.2 2011/08/16 04:45:17 christos Exp $ */
/* /*
* Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
@ -191,9 +191,10 @@ isc_sockaddr_format(const isc_sockaddr_t *sa, char *array, unsigned int size) {
* The message is the same as in netaddr.c. * The message is the same as in netaddr.c.
*/ */
snprintf(array, size, snprintf(array, size,
"<%s %u>",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_NETADDR, isc_msgcat_get(isc_msgcat, ISC_MSGSET_NETADDR,
ISC_MSG_UNKNOWNADDR, ISC_MSG_UNKNOWNADDR,
"<unknown address, family %u>"), "unknown address, family"),
sa->type.sa.sa_family); sa->type.sa.sa_family);
array[size - 1] = '\0'; array[size - 1] = '\0';
} }
@ -229,10 +230,11 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
break; break;
default: default:
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"%s: %d",
isc_msgcat_get(isc_msgcat, isc_msgcat_get(isc_msgcat,
ISC_MSGSET_SOCKADDR, ISC_MSGSET_SOCKADDR,
ISC_MSG_UNKNOWNFAMILY, ISC_MSG_UNKNOWNFAMILY,
"unknown address family: %d"), "unknown address family"),
(int)sockaddr->type.sa.sa_family); (int)sockaddr->type.sa.sa_family);
s = (const unsigned char *)&sockaddr->type; s = (const unsigned char *)&sockaddr->type;
length = sockaddr->length; length = sockaddr->length;
@ -409,9 +411,10 @@ isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port) {
break; break;
default: default:
FATAL_ERROR(__FILE__, __LINE__, FATAL_ERROR(__FILE__, __LINE__,
"%s: %d",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKADDR, isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKADDR,
ISC_MSG_UNKNOWNFAMILY, ISC_MSG_UNKNOWNFAMILY,
"unknown address family: %d"), "unknown address family"),
(int)sockaddr->type.sa.sa_family); (int)sockaddr->type.sa.sa_family);
} }
} }
@ -429,9 +432,10 @@ isc_sockaddr_getport(const isc_sockaddr_t *sockaddr) {
break; break;
default: default:
FATAL_ERROR(__FILE__, __LINE__, FATAL_ERROR(__FILE__, __LINE__,
"%s: %d",
isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKADDR, isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKADDR,
ISC_MSG_UNKNOWNFAMILY, ISC_MSG_UNKNOWNFAMILY,
"unknown address family: %d"), "unknown address family"),
(int)sockaddr->type.sa.sa_family); (int)sockaddr->type.sa.sa_family);
} }

6
external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ifiter_getifaddrs.c,v 1.1.1.1 2009/12/13 16:54:32 kardel Exp $ */ /* $NetBSD: ifiter_getifaddrs.c,v 1.2 2011/08/16 04:45:17 christos Exp $ */
/* /*
* Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC")
@ -85,11 +85,11 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
if (getifaddrs(&iter->ifaddrs) < 0) { if (getifaddrs(&iter->ifaddrs) < 0) {
isc__strerror(errno, strbuf, sizeof(strbuf)); isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"getting interface addresses: %s: %s",
isc_msgcat_get(isc_msgcat, isc_msgcat_get(isc_msgcat,
ISC_MSGSET_IFITERGETIFADDRS, ISC_MSGSET_IFITERGETIFADDRS,
ISC_MSG_GETIFADDRS, ISC_MSG_GETIFADDRS,
"getting interface " "getifaddrs"),
"addresses: getifaddrs: %s"),
strbuf); strbuf);
result = ISC_R_UNEXPECTED; result = ISC_R_UNEXPECTED;
goto failure; goto failure;

4
external/bsd/ntp/dist/lib/isc/unix/socket.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: socket.c,v 1.1.1.1 2009/12/13 16:54:37 kardel Exp $ */ /* $NetBSD: socket.c,v 1.2 2011/08/16 04:45:17 christos Exp $ */
/* /*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2004-2009 Internet Systems Consortium, Inc. ("ISC")
@ -603,7 +603,7 @@ FIX_IPV6_RECVPKTINFO(isc_socket_t *sock)
if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, if (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_RECVPKTINFO,
(void *)&on, sizeof(on)) < 0) { (void *)&on, sizeof(on)) < 0) {
isc__strerror(errno, strbuf, sizeof(strbuf));
UNEXPECTED_ERROR(__FILE__, __LINE__, UNEXPECTED_ERROR(__FILE__, __LINE__,
"setsockopt(%d, IPV6_RECVPKTINFO) " "setsockopt(%d, IPV6_RECVPKTINFO) "
"%s: %s", sock->fd, "%s: %s", sock->fd,

4
external/bsd/ntp/lib/libopts/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2009/12/13 17:13:47 kardel Exp $ # $NetBSD: Makefile,v 1.2 2011/08/16 04:45:17 christos Exp $
LIBISPRIVATE=yes LIBISPRIVATE=yes
@ -16,4 +16,6 @@ CPPFLAGS+=-I${DIST}
SRCS=libopts.c SRCS=libopts.c
COPTS.libopts.c += -Wno-format-nonliteral
.include <bsd.lib.mk> .include <bsd.lib.mk>