Use more mundane 'int' type for cancel key lengths in libpq

hlinnaka · hlinnaka · commit 965213d9c56a · 2025-05-08T22:01:20.000+03:00
The documented max length of a cancel key is 256 bytes, so it fits in uint8. It nevertheless seems weird to not just use 'int', like in commit 0f1433f for the backend. Discussion: https://www.postgresql.org/message-id/61be9e31-7b7d-49d5-bc11-721800d89d64%40eisentraut.org
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
@@ -1532,7 +1532,7 @@ getParameterStatus(PGconn *conn)
 static int
 getBackendKeyData(PGconn *conn, int msgLength)
 {
-	uint8		cancel_key_len;
+	int			cancel_key_len;
 
 	if (conn->be_cancel_key)
 	{
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
@@ -547,8 +547,8 @@ struct pg_conn
 
 	/* Miscellaneous stuff */
 	int			be_pid;			/* PID of backend --- needed for cancels */
+	int			be_cancel_key_len;
 	char	   *be_cancel_key;	/* query cancellation key and its length */
-	uint16		be_cancel_key_len;
 	pgParameterStatus *pstatus; /* ParameterStatus data */
 	int			client_encoding;	/* encoding id */
 	bool		std_strings;	/* standard_conforming_strings */

Original file line number	Diff line number	Diff line change
`@@ -1532,7 +1532,7 @@ getParameterStatus(PGconn *conn)`
`1532`	`1532`	`static int`
`1533`	`1533`	`getBackendKeyData(PGconn *conn, int msgLength)`
`1534`	`1534`	`{`
`1535`		`- uint8 cancel_key_len;`
	`1535`	`+ int cancel_key_len;`
`1536`	`1536`
`1537`	`1537`	`if (conn->be_cancel_key)`
`1538`	`1538`	`{`