From da6f101b0ecc2d4e4b33bbcae316dbaf72e67d14 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 6 Aug 2024 17:59:45 +0300 Subject: [PATCH 3/5] Mark misc static global variables as const Discussion: https://www.postgresql.org/message-id/7f86e06a-98c5-4ce3-8ec9-3885c8de0358@iki.fi --- contrib/btree_gist/btree_interval.c | 2 +- contrib/oid2name/oid2name.c | 2 +- src/backend/access/transam/xlogprefetcher.c | 2 +- src/common/sha1.c | 2 +- src/pl/plpython/plpy_cursorobject.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c index b0afdf02bb..156f2cebac 100644 --- a/contrib/btree_gist/btree_interval.c +++ b/contrib/btree_gist/btree_interval.c @@ -113,7 +113,7 @@ static const gbtree_ninfo tinfo = Interval * abs_interval(Interval *a) { - static Interval zero = {0, 0, 0}; + static const Interval zero = {0, 0, 0}; if (DatumGetBool(DirectFunctionCall2(interval_lt, IntervalPGetDatum(a), diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index e8c1e2c97b..c2785848f5 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -62,7 +62,7 @@ void sql_exec_dumpalltbspc(PGconn *conn, struct options *opts); void get_opts(int argc, char **argv, struct options *my_opts) { - static struct option long_options[] = { + static const struct option long_options[] = { {"dbname", required_argument, NULL, 'd'}, {"host", required_argument, NULL, 'h'}, {"host", required_argument, NULL, 'H'}, /* deprecated */ diff --git a/src/backend/access/transam/xlogprefetcher.c b/src/backend/access/transam/xlogprefetcher.c index 84023d61ba..2dc2fb760a 100644 --- a/src/backend/access/transam/xlogprefetcher.c +++ b/src/backend/access/transam/xlogprefetcher.c @@ -362,7 +362,7 @@ XLogPrefetcher * XLogPrefetcherAllocate(XLogReaderState *reader) { XLogPrefetcher *prefetcher; - static HASHCTL hash_table_ctl = { + const HASHCTL hash_table_ctl = { .keysize = sizeof(RelFileLocator), .entrysize = sizeof(XLogPrefetcherFilter) }; diff --git a/src/common/sha1.c b/src/common/sha1.c index 0525c4ff31..abfbd1c087 100644 --- a/src/common/sha1.c +++ b/src/common/sha1.c @@ -61,7 +61,7 @@ #include "sha1_int.h" /* constant table */ -static uint32 _K[] = {0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6}; +static const uint32 _K[] = {0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6}; #define K(t) _K[(t) / 20] diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c index 57e8f8ec21..24f2ac8c46 100644 --- a/src/pl/plpython/plpy_cursorobject.c +++ b/src/pl/plpython/plpy_cursorobject.c @@ -27,7 +27,7 @@ static PyObject *PLy_cursor_iternext(PyObject *self); static PyObject *PLy_cursor_fetch(PyObject *self, PyObject *args); static PyObject *PLy_cursor_close(PyObject *self, PyObject *unused); -static char PLy_cursor_doc[] = "Wrapper around a PostgreSQL cursor"; +static const char PLy_cursor_doc[] = "Wrapper around a PostgreSQL cursor"; static PyMethodDef PLy_cursor_methods[] = { {"fetch", PLy_cursor_fetch, METH_VARARGS, NULL}, -- 2.39.2