From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 19 Apr 2023 07:37:17 +0000 (-0500)
Subject: Rename a poorly-named variable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4baa332b457c8f3d8fd71aac25e06ea7e10a02;p=thirdparty%2Fntp.git

Rename a poorly-named variable

bk: 643f9a2dxn-xojgapw56Ry-An3UEKg
---

diff --git a/ChangeLog b/ChangeLog
index 5a6d7836e..6a333b89b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@
              Integrated patch from Brian Utterback. <hart@ntp.org>
 * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
 * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
+* Rename a poorly-named variable.  <stenn@ntp.org>
 * Disable "embedded NUL in string" messages in libopts, when we can. <stenn@>
 * Use https in the AC_INIT URLs in configure.ac.  <stenn@ntp.org>
 * Implement NTP_FUNC_REALPATH.  <stenn@ntp.org>
diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 2f82c4cfb..4a4207683 100644
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -1395,11 +1395,11 @@ crypto_xmit(
 	 * puppy; if a response, return so the sender can flame, too.
 	 */
 	if (rval != XEVNT_OK) {
-		u_int32	uint32;
+		u_int32	opcode_bits;
 
-		uint32 = CRYPTO_ERROR;
-		opcode |= uint32;
-		fp->opcode |= htonl(uint32);
+		opcode_bits = CRYPTO_ERROR;
+		opcode |= opcode_bits;
+		fp->opcode |= htonl(opcode_bits);
 		snprintf(statstr, sizeof(statstr),
 		    "%04x %d %02x %s", opcode, associd, rval,
 		    eventstr(rval));