From: Mark Andrews Date: Wed, 14 Feb 2018 09:32:51 +0000 (+1100) Subject: prevent implict conversion to signed X-Git-Tag: v9.13.0~155^2~3^2~44 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b803b34634428b3f817d9db33788b0a043fb4fe;p=thirdparty%2Fbind9.git prevent implict conversion to signed --- diff --git a/lib/dns/message.c b/lib/dns/message.c index 541fafd0569..95d9382947d 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2017 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 1999-2018 Internet Systems Consortium, Inc. ("ISC") * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -3862,11 +3862,11 @@ dns_message_pseudosectiontotext(dns_message_t *msg, ADD_STRING(target, "; EXPIRE"); } else if (optcode == DNS_OPT_TCP_KEEPALIVE) { if (optlen == 2) { - isc_uint16_t dsecs; + unsigned int dsecs; dsecs = isc_buffer_getuint16(&optbuf); ADD_STRING(target, "; TCP KEEPALIVE:"); snprintf(buf, sizeof(buf), " %u.%u", - dsecs / 10, dsecs % 10); + dsecs / 10U, dsecs % 10U); ADD_STRING(target, buf); ADD_STRING(target, " secs\n"); continue; diff --git a/util/copyrights b/util/copyrights index a2b9f3c4679..6173b1f1baf 100644 --- a/util/copyrights +++ b/util/copyrights @@ -3455,7 +3455,7 @@ ./lib/dns/mapapi X 2013,2017 ./lib/dns/master.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018 ./lib/dns/masterdump.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017,2018 -./lib/dns/message.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 +./lib/dns/message.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 ./lib/dns/name.c C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/ncache.c C 1999,2000,2001,2002,2003,2004,2005,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017 ./lib/dns/nsec.c C 1999,2000,2001,2003,2004,2005,2007,2008,2009,2011,2012,2013,2014,2015,2016