Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.c,v
rcsdiff: /ftp/cvs/cvsroot/src/external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1.1.6
retrieving revision 1.1.1.7
diff -u -p -r1.1.1.6 -r1.1.1.7
--- src/external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.c	2021/04/29 16:46:30	1.1.1.6
+++ src/external/mpl/bind/dist/lib/dns/rdata/generic/loc_29.c	2022/09/23 12:09:20	1.1.1.7
@@ -1,8 +1,10 @@
-/*	$NetBSD: loc_29.c,v 1.1.1.6 2021/04/29 16:46:30 christos Exp $	*/
+/*	$NetBSD: loc_29.c,v 1.1.1.7 2022/09/23 12:09:20 christos Exp $	*/
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
+ * SPDX-License-Identifier: MPL-2.0
+ *
  * 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
  * file, you can obtain one at https://mozilla.org/MPL/2.0/.
@@ -257,7 +259,7 @@ done:
 	return (ISC_R_SUCCESS);
 }
 
-static inline isc_result_t
+static isc_result_t
 loc_getlatitude(isc_lex_t *lexer, unsigned long *latitude) {
 	unsigned long d1 = 0, m1 = 0, s1 = 0;
 	int direction = 0;
@@ -272,14 +274,13 @@ loc_getlatitude(isc_lex_t *lexer, unsign
 		*latitude = 0x80000000 - (d1 * 3600 + m1 * 60) * 1000 - s1;
 		break;
 	default:
-		INSIST(0);
-		ISC_UNREACHABLE();
+		UNREACHABLE();
 	}
 
 	return (ISC_R_SUCCESS);
 }
 
-static inline isc_result_t
+static isc_result_t
 loc_getlongitude(isc_lex_t *lexer, unsigned long *longitude) {
 	unsigned long d2 = 0, m2 = 0, s2 = 0;
 	int direction = 0;
@@ -294,14 +295,13 @@ loc_getlongitude(isc_lex_t *lexer, unsig
 		*longitude = 0x80000000 - (d2 * 3600 + m2 * 60) * 1000 - s2;
 		break;
 	default:
-		INSIST(0);
-		ISC_UNREACHABLE();
+		UNREACHABLE();
 	}
 
 	return (ISC_R_SUCCESS);
 }
 
-static inline isc_result_t
+static isc_result_t
 loc_getaltitude(isc_lex_t *lexer, unsigned long *altitude) {
 	isc_token_t token;
 	unsigned long cm;
@@ -327,7 +327,7 @@ loc_getaltitude(isc_lex_t *lexer, unsign
 	return (ISC_R_SUCCESS);
 }
 
-static inline isc_result_t
+static isc_result_t
 loc_getoptionalprecision(isc_lex_t *lexer, unsigned char *valuep) {
 	isc_token_t token;
 
@@ -343,17 +343,17 @@ loc_getoptionalprecision(isc_lex_t *lexe
 	return (ISC_R_SUCCESS);
 }
 
-static inline isc_result_t
+static isc_result_t
 loc_getsize(isc_lex_t *lexer, unsigned char *sizep) {
 	return (loc_getoptionalprecision(lexer, sizep));
 }
 
-static inline isc_result_t
+static isc_result_t
 loc_gethorizontalprecision(isc_lex_t *lexer, unsigned char *hpp) {
 	return (loc_getoptionalprecision(lexer, hpp));
 }
 
-static inline isc_result_t
+static isc_result_t
 loc_getverticalprecision(isc_lex_t *lexer, unsigned char *vpp) {
 	return (loc_getoptionalprecision(lexer, vpp));
 }
@@ -382,7 +382,7 @@ loc_getverticalprecision(isc_lex_t *lexe
  * ZIP/postal code area sizes, since it is often easy to find
  * approximate geographical location by ZIP/postal code.
  */
-static inline isc_result_t
+static isc_result_t
 fromtext_loc(ARGS_FROMTEXT) {
 	isc_result_t result = ISC_R_SUCCESS;
 	unsigned long latitude = 0;
@@ -435,7 +435,7 @@ encode:
 	return (result);
 }
 
-static inline isc_result_t
+static isc_result_t
 totext_loc(ARGS_TOTEXT) {
 	int d1, m1, s1, fs1;
 	int d2, m2, s2, fs2;
@@ -554,7 +554,7 @@ totext_loc(ARGS_TOTEXT) {
 	return (str_totext(buf, target));
 }
 
-static inline isc_result_t
+static isc_result_t
 fromwire_loc(ARGS_FROMWIRE) {
 	isc_region_t sr;
 	unsigned char c;
@@ -654,7 +654,7 @@ fromwire_loc(ARGS_FROMWIRE) {
 	return (mem_tobuffer(target, sr.base, 16));
 }
 
-static inline isc_result_t
+static isc_result_t
 towire_loc(ARGS_TOWIRE) {
 	UNUSED(cctx);
 
@@ -664,7 +664,7 @@ towire_loc(ARGS_TOWIRE) {
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
-static inline int
+static int
 compare_loc(ARGS_COMPARE) {
 	isc_region_t r1;
 	isc_region_t r2;
@@ -680,7 +680,7 @@ compare_loc(ARGS_COMPARE) {
 	return (isc_region_compare(&r1, &r2));
 }
 
-static inline isc_result_t
+static isc_result_t
 fromstruct_loc(ARGS_FROMSTRUCT) {
 	dns_rdata_loc_t *loc = source;
 	uint8_t c;
@@ -732,7 +732,7 @@ fromstruct_loc(ARGS_FROMSTRUCT) {
 	return (uint32_tobuffer(loc->v.v0.altitude, target));
 }
 
-static inline isc_result_t
+static isc_result_t
 tostruct_loc(ARGS_TOSTRUCT) {
 	dns_rdata_loc_t *loc = target;
 	isc_region_t r;
@@ -771,7 +771,7 @@ tostruct_loc(ARGS_TOSTRUCT) {
 	return (ISC_R_SUCCESS);
 }
 
-static inline void
+static void
 freestruct_loc(ARGS_FREESTRUCT) {
 	dns_rdata_loc_t *loc = source;
 
@@ -782,7 +782,7 @@ freestruct_loc(ARGS_FREESTRUCT) {
 	UNUSED(loc);
 }
 
-static inline isc_result_t
+static isc_result_t
 additionaldata_loc(ARGS_ADDLDATA) {
 	REQUIRE(rdata->type == dns_rdatatype_loc);
 
@@ -793,7 +793,7 @@ additionaldata_loc(ARGS_ADDLDATA) {
 	return (ISC_R_SUCCESS);
 }
 
-static inline isc_result_t
+static isc_result_t
 digest_loc(ARGS_DIGEST) {
 	isc_region_t r;
 
@@ -804,7 +804,7 @@ digest_loc(ARGS_DIGEST) {
 	return ((digest)(arg, &r));
 }
 
-static inline bool
+static bool
 checkowner_loc(ARGS_CHECKOWNER) {
 	REQUIRE(type == dns_rdatatype_loc);
 
@@ -816,7 +816,7 @@ checkowner_loc(ARGS_CHECKOWNER) {
 	return (true);
 }
 
-static inline bool
+static bool
 checknames_loc(ARGS_CHECKNAMES) {
 	REQUIRE(rdata->type == dns_rdatatype_loc);
 
@@ -827,7 +827,7 @@ checknames_loc(ARGS_CHECKNAMES) {
 	return (true);
 }
 
-static inline int
+static int
 casecompare_loc(ARGS_COMPARE) {
 	return (compare_loc(rdata1, rdata2));
 }