9.2.0a3

3 files changed, 29 insertions, 45 deletions

diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index f91471a9..808a2b39 100644
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/in_1/naptr_35.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.41 2001/03/16 22:53:14 bwelling Exp $ */
+/* $Id: naptr_35.c,v 1.42 2001/06/21 04:00:45 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -319,12 +319,9 @@ fromstruct_in_naptr(ARGS_FROMSTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(naptr->common.rdtype == type);
 	REQUIRE(naptr->common.rdclass == rdclass);
-	REQUIRE((naptr->flags == NULL && naptr->flags_len == 0) ||
-		(naptr->flags != NULL && naptr->flags_len != 0));
-	REQUIRE((naptr->service == NULL && naptr->service_len == 0) ||
-		(naptr->service != NULL && naptr->service_len != 0));
-	REQUIRE((naptr->regexp == NULL && naptr->regexp_len == 0) ||
-		(naptr->regexp != NULL && naptr->regexp_len != 0));
+	REQUIRE(naptr->flags != NULL || naptr->flags_len == 0);
+	REQUIRE(naptr->service != NULL && naptr->service_len == 0);
+	REQUIRE(naptr->regexp != NULL && naptr->regexp_len == 0);
 
 	UNUSED(type);
 	UNUSED(rdclass);
@@ -371,34 +368,27 @@ tostruct_in_naptr(ARGS_TOSTRUCT) {
 
 	naptr->flags_len = uint8_fromregion(&r);
 	isc_region_consume(&r, 1);
-	if (naptr->flags_len != 0) {
-		INSIST(naptr->flags_len <= r.length);
-		naptr->flags = mem_maybedup(mctx, r.base, naptr->flags_len);
-		if (naptr->flags == NULL)
-			goto cleanup;
-		isc_region_consume(&r, naptr->flags_len);
-	}
+	INSIST(naptr->flags_len <= r.length);
+	naptr->flags = mem_maybedup(mctx, r.base, naptr->flags_len);
+	if (naptr->flags == NULL)
+		goto cleanup;
+	isc_region_consume(&r, naptr->flags_len);
 
 	naptr->service_len = uint8_fromregion(&r);
 	isc_region_consume(&r, 1);
-	if (naptr->service_len != 0) {
-		INSIST(naptr->service_len <= r.length);
-		naptr->service = mem_maybedup(mctx, r.base,
-					       naptr->service_len);
-		if (naptr->service == NULL)
-			goto cleanup;
-		isc_region_consume(&r, naptr->service_len);
-	}
+	INSIST(naptr->service_len <= r.length);
+	naptr->service = mem_maybedup(mctx, r.base, naptr->service_len);
+	if (naptr->service == NULL)
+		goto cleanup;
+	isc_region_consume(&r, naptr->service_len);
 
 	naptr->regexp_len = uint8_fromregion(&r);
 	isc_region_consume(&r, 1);
-	if (naptr->regexp_len != 0) {
-		INSIST(naptr->regexp_len <= r.length);
-		naptr->regexp = mem_maybedup(mctx, r.base, naptr->regexp_len);
-		if (naptr->regexp == NULL)
-			goto cleanup;
-		isc_region_consume(&r, naptr->regexp_len);
-	}
+	INSIST(naptr->regexp_len <= r.length);
+	naptr->regexp = mem_maybedup(mctx, r.base, naptr->regexp_len);
+	if (naptr->regexp == NULL)
+		goto cleanup;
+	isc_region_consume(&r, naptr->regexp_len);
 
 	dns_name_init(&name, NULL);
 	dns_name_fromregion(&name, &r);
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index 9b7c7238..244aad18 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap_22.c,v 1.31 2001/03/16 22:53:16 bwelling Exp $ */
+/* $Id: nsap_22.c,v 1.32 2001/06/21 04:00:46 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
 
@@ -152,8 +152,7 @@ fromstruct_in_nsap(ARGS_FROMSTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(nsap->common.rdtype == type);
 	REQUIRE(nsap->common.rdclass == rdclass);
-	REQUIRE((nsap->nsap == NULL && nsap->nsap_len == 0) ||
-		(nsap->nsap != NULL && nsap->nsap_len != 0));
+	REQUIRE(nsap->nsap != NULL || nsap->nsap_len == 0);
 
 	UNUSED(type);
 	UNUSED(rdclass);
@@ -177,12 +176,9 @@ tostruct_in_nsap(ARGS_TOSTRUCT) {
 
 	dns_rdata_toregion(rdata, &r);
 	nsap->nsap_len = r.length;
-	if (nsap->nsap_len != 0) {
-		nsap->nsap = mem_maybedup(mctx, r.base, r.length);
-		if (nsap->nsap == NULL)
-			return (ISC_R_NOMEMORY);
-	} else
-		nsap->nsap = NULL;
+	nsap->nsap = mem_maybedup(mctx, r.base, r.length);
+	if (nsap->nsap == NULL)
+		return (ISC_R_NOMEMORY);
 
 	nsap->mctx = mctx;
 	return (ISC_R_SUCCESS);
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 90ac9c07..8abcb4b6 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.42 2001/03/16 22:53:20 bwelling Exp $ */
+/* $Id: wks_11.c,v 1.43 2001/06/21 04:00:47 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
@@ -242,6 +242,7 @@ fromstruct_in_wks(ARGS_FROMSTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(wks->common.rdtype == type);
 	REQUIRE(wks->common.rdclass == rdclass);
+	REQUIRE(wks->map != NULL || wks->map_len == 0);
 
 	UNUSED(type);
 	UNUSED(rdclass);
@@ -273,12 +274,9 @@ tostruct_in_wks(ARGS_TOSTRUCT) {
 	wks->protocol = uint16_fromregion(&region);
 	isc_region_consume(&region, 2);
 	wks->map_len = region.length;
-	if (wks->map_len > 0) {
-		wks->map = mem_maybedup(mctx, region.base, region.length);
-		if (wks->map == NULL)
-			return (ISC_R_NOMEMORY);
-	} else
-		wks->map = NULL;
+	wks->map = mem_maybedup(mctx, region.base, region.length);
+	if (wks->map == NULL)
+		return (ISC_R_NOMEMORY);
 	wks->mctx = mctx;
 	return (ISC_R_SUCCESS);
 }