diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 54f0a694bf..b99b0d3d00 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -869,7 +869,7 @@ named_os_shutdownmsg(char *command, isc_buffer_t *text) {
 	pid_t pid;
 
 	/* Skip the command name. */
-	if ((ptr = strtok_r(command, " \t", &last)) == NULL) {
+	if (strtok_r(command, " \t", &last) == NULL) {
 		return;
 	}
 
diff --git a/lib/dns/openssleddsa_link.c b/lib/dns/openssleddsa_link.c
index 19c52670af..326cf67c7e 100644
--- a/lib/dns/openssleddsa_link.c
+++ b/lib/dns/openssleddsa_link.c
@@ -518,7 +518,6 @@ static bool
 openssleddsa_isprivate(const dst_key_t *key) {
 	EVP_PKEY *pkey = key->keydata.pkey;
 	int len;
-	unsigned long err;
 
 	if (pkey == NULL) {
 		return (false);
@@ -529,7 +528,7 @@ openssleddsa_isprivate(const dst_key_t *key) {
 		return (true);
 	}
 	/* can check if first error is EC_R_INVALID_PRIVATE_KEY */
-	while ((err = ERR_get_error()) != 0) {
+	while (ERR_get_error() != 0) {
 		/**/
 	}
 
diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index a2f2e4b7ea..a16b760ee4 100644
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1114,7 +1114,8 @@ trim_zbits(dns_rpz_zbits_t zbits, dns_rpz_zbits_t found) {
 	x = zbits & found;
 	x &= (~x + 1);
 	x = (x << 1) - 1;
-	return (zbits &= x);
+	zbits &= x;
+	return (zbits);
 }
 
 /*