Fix a few oversights in the longer cancel keys

Change MyCancelKeyLength's type from uint8 to int. While it always
fits in a uint8, plain int is less surprising, as there's no
particular reason for it to be uint8.

Fix one ProcSignalInit caller that passed 'false' instead of NULL for
the pointer argument.

Author: Peter Eisentraut <[email protected]>
Discussion: https://www.postgresql.org/message-id/61be9e31-7b7d-49d5-bc11-721800d89d64@eisentraut.org

diff --git a/src/backend/postmaster/auxprocess.c b/src/backend/postmaster/auxprocess.c
index 4f6795f72650fdf001e4e409514a063f6609c7c0..a6d3630398f4dd206866048c8bbb9c836b45d518 100644 (file)
--- a/src/backend/postmaster/auxprocess.c
+++ b/src/backend/postmaster/auxprocess.c
@@ -66,7 +66,7 @@ AuxiliaryProcessMainCommon(void)
 
    BaseInit();
 
-   ProcSignalInit(false, 0);
+   ProcSignalInit(NULL, 0);
 
    /*
     * Auxiliary processes don't run transactions, but they may need a

diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 92304a1f12412c97c29460134e19ce9f836485e4..1847e7c85d3a101a9d436a0d6b2954c43612c301 100644 (file)
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -51,7 +51,7 @@ TimestampTz MyStartTimestamp;
 struct ClientSocket *MyClientSocket;
 struct Port *MyProcPort;
 char       MyCancelKey[MAX_CANCEL_KEY_LENGTH];
-uint8      MyCancelKeyLength = 0;
+int            MyCancelKeyLength = 0;
 int            MyPMChildSlot;
 
 /*

diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 58b2496a9cb34b02f302be91fbcbf6b88012023d..72f5655fb344d1a7063f82c4e039047811bfbe1d 100644 (file)
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -193,7 +193,7 @@ extern PGDLLIMPORT TimestampTz MyStartTimestamp;
 extern PGDLLIMPORT struct Port *MyProcPort;
 extern PGDLLIMPORT struct Latch *MyLatch;
 extern PGDLLIMPORT char MyCancelKey[];
-extern PGDLLIMPORT uint8 MyCancelKeyLength;
+extern PGDLLIMPORT int MyCancelKeyLength;
 extern PGDLLIMPORT int MyPMChildSlot;
 
 extern PGDLLIMPORT char OutputFileName[];