From cc2a7ff6444a68ecfcb51d7c9e2841609fb182f5 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Tue, 15 Sep 2026 08:43:09 +0200
Subject: [PATCH v2 6/8] Convert some casts to unconstify

These casts existed only to cast away a const qualifier.  Convert them
to unconstify to make that more explicit.
---
 src/backend/executor/execExpr.c | 2 +-
 src/backend/replication/slot.c  | 2 +-
 src/backend/storage/ipc/shmem.c | 2 +-
 src/backend/storage/smgr/md.c   | 2 +-
 src/backend/utils/mb/mbutils.c  | 4 ++--
 src/port/bsearch_arg.c          | 2 +-
 src/port/path.c                 | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
index 82e846a1f4f..3f063b79f4d 100644
--- a/src/backend/executor/execExpr.c
+++ b/src/backend/executor/execExpr.c
@@ -4312,7 +4312,7 @@ ExecBuildHash32Expr(TupleDesc desc, const TupleTableSlotOps *ops,
 	state->parent = parent;
 
 	/* Insert setup steps as needed. */
-	ExecCreateExprSetupSteps(state, (Node *) hash_exprs);
+	ExecCreateExprSetupSteps(state, unconstify(Node *, (const Node *) hash_exprs));
 
 	/*
 	 * Make a place to store intermediate hash values between subsequent
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index 63ce6d27885..f2d416487fa 100644
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -420,7 +420,7 @@ ReplicationSlotCreate(const char *name, bool db_specific,
 					errmsg("cannot enable failover for a temporary replication slot"));
 	}
 
-	INJECTION_POINT("replication-slot-create-begin", (char *) name);
+	INJECTION_POINT("replication-slot-create-begin", unconstify(char *, name));
 
 	/*
 	 * If some other backend ran this code concurrently with us, we'd likely
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index f971ee24192..51c892bf8e1 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -935,7 +935,7 @@ RegisterShmemCallbacks(const ShmemCallbacks *callbacks)
 	{
 		/* Remember the callbacks for later */
 		registered_shmem_callbacks = lappend(registered_shmem_callbacks,
-											 (void *) callbacks);
+											 unconstify(ShmemCallbacks *, callbacks));
 	}
 	else
 		elog(ERROR, "cannot request shared memory at this time");
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 780c88c0630..4c777757757 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -1101,7 +1101,7 @@ mdwritev(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 		if (nblocks_this_segment != nblocks)
 			elog(ERROR, "write crosses segment boundary");
 
-		iovcnt = buffers_to_iovec(iov, (void **) buffers, nblocks_this_segment);
+		iovcnt = buffers_to_iovec(iov, unconstify(void **, buffers), nblocks_this_segment);
 		size_this_segment = nblocks_this_segment * BLCKSZ;
 		transferred_this_segment = 0;
 
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index e4f29c2b1c9..b57dba4ead1 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -1945,7 +1945,7 @@ pgwin32_message_to_UTF16(const char *str, int len, int *utf16len)
 		 */
 		if (IsTransactionState())
 		{
-			utf8 = (char *) pg_do_encoding_conversion((unsigned char *) str,
+			utf8 = (char *) pg_do_encoding_conversion((unsigned char *) unconstify(char *, str),
 													  len,
 													  msgenc,
 													  PG_UTF8);
@@ -1953,7 +1953,7 @@ pgwin32_message_to_UTF16(const char *str, int len, int *utf16len)
 				len = strlen(utf8);
 		}
 		else
-			utf8 = (char *) str;
+			utf8 = unconstify(char *, str);
 
 		utf16 = palloc_array(WCHAR, len + 1);
 		dstlen = MultiByteToWideChar(CP_UTF8, 0, utf8, len, utf16, len);
diff --git a/src/port/bsearch_arg.c b/src/port/bsearch_arg.c
index bc2db8239cd..3739225e755 100644
--- a/src/port/bsearch_arg.c
+++ b/src/port/bsearch_arg.c
@@ -67,7 +67,7 @@ bsearch_arg(const void *key, const void *base0,
 		p = base + (lim >> 1) * size;
 		cmp = (*compar) (key, p, arg);
 		if (cmp == 0)
-			return (void *) p;
+			return unconstify(void *, p);
 		if (cmp > 0)
 		{						/* key > p: move right */
 			base = (const char *) p + size;
diff --git a/src/port/path.c b/src/port/path.c
index fef0ae77f87..75017c5185b 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -78,7 +78,7 @@ skip_drive(const char *path)
 	{
 		path += 2;
 	}
-	return (char *) path;
+	return unconstify(char *, path);
 }
 #else
 
-- 
2.55.0