Here is a series of patches to remove some unused function parameters.
In each case, the need for them was removed by some other code changes
over time but the unusedness was not noticed. I have included a
reference to when they became unused in each case.
--
Peter Eisentraut http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
From 60dec2ff746aff7cfec1838c0d4afc4fd3d38824 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 01/11] Remove unused parameter
unused since 39bd3fd1db6f3aa3764d4a1bebcd71c4e9c00281
---
src/pl/plpgsql/src/pl_gram.y | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index 5a7e1a4444..8227bf0449 100644
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -107,7 +107,7 @@ static void check_labels(const
char *start_label,
const
char *end_label,
int
end_location);
static PLpgSQL_expr *read_cursor_args(PLpgSQL_var *cursor,
-
int until, const char *expected);
+
int until);
static List *read_raise_options(void);
static void check_raise_parameters(PLpgSQL_stmt_raise
*stmt);
@@ -1414,8 +1414,7 @@ for_control : for_variable K_IN
/* collect cursor's
parameters if any */
new->argquery =
read_cursor_args(cursor,
-
K_LOOP,
-
"LOOP");
+
K_LOOP);
/* create loop's
private RECORD variable */
new->var =
(PLpgSQL_variable *)
@@ -2129,7 +2128,7 @@ stmt_open : K_OPEN cursor_variable
else
{
/* predefined cursor
query, so read args */
- new->argquery =
read_cursor_args($2, ';', ";");
+ new->argquery =
read_cursor_args($2, ';');
}
$$ = (PLpgSQL_stmt *)new;
@@ -3773,7 +3772,7 @@ check_labels(const char *start_label, const char
*end_label, int end_location)
* parens).
*/
static PLpgSQL_expr *
-read_cursor_args(PLpgSQL_var *cursor, int until, const char *expected)
+read_cursor_args(PLpgSQL_var *cursor, int until)
{
PLpgSQL_expr *expr;
PLpgSQL_row *row;
--
2.28.0
From d5945d01d5a067df49ec4fa8763be7fdf206a078 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 02/11] Remove unused parameter
Apparently, this was never used when
introduced (3dad73e71f08abd86564d5090a58ca71740e07e0).
---
src/bin/pg_basebackup/receivelog.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/bin/pg_basebackup/receivelog.c
b/src/bin/pg_basebackup/receivelog.c
index d3f99d89c5..dc97c7e89c 100644
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -46,8 +46,7 @@ static bool ProcessXLogDataMsg(PGconn *conn, StreamCtl
*stream, char *copybuf, i
XLogRecPtr
*blockpos);
static PGresult *HandleEndOfCopyStream(PGconn *conn, StreamCtl *stream, char
*copybuf,
XLogRecPtr blockpos, XLogRecPtr *stoppos);
-static bool CheckCopyStreamStop(PGconn *conn, StreamCtl *stream, XLogRecPtr
blockpos,
- XLogRecPtr
*stoppos);
+static bool CheckCopyStreamStop(PGconn *conn, StreamCtl *stream, XLogRecPtr
blockpos);
static long CalculateCopyStreamSleeptime(TimestampTz now, int
standby_message_timeout,
TimestampTz last_status);
@@ -747,7 +746,7 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream,
/*
* Check if we should continue streaming, or abort at this
point.
*/
- if (!CheckCopyStreamStop(conn, stream, blockpos, stoppos))
+ if (!CheckCopyStreamStop(conn, stream, blockpos))
goto error;
now = feGetCurrentTimestamp();
@@ -825,7 +824,7 @@ HandleCopyStream(PGconn *conn, StreamCtl *stream,
* Check if we should continue streaming, or
abort at this
* point.
*/
- if (!CheckCopyStreamStop(conn, stream,
blockpos, stoppos))
+ if (!CheckCopyStreamStop(conn, stream,
blockpos))
goto error;
}
else
@@ -1203,8 +1202,7 @@ HandleEndOfCopyStream(PGconn *conn, StreamCtl *stream,
char *copybuf,
* Check if we should continue streaming, or abort at this point.
*/
static bool
-CheckCopyStreamStop(PGconn *conn, StreamCtl *stream, XLogRecPtr blockpos,
- XLogRecPtr *stoppos)
+CheckCopyStreamStop(PGconn *conn, StreamCtl *stream, XLogRecPtr blockpos)
{
if (still_sending && stream->stream_stop(blockpos, stream->timeline,
false))
{
--
2.28.0
From abea0b0be764bb7a22571622f21307638303b755 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 03/11] Remove unused parameter
unused since cc8d41511721d25d557fc02a46c053c0a602fed0
---
src/bin/pg_dump/pg_backup_archiver.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bin/pg_dump/pg_backup_archiver.c
b/src/bin/pg_dump/pg_backup_archiver.c
index c05a1fd6af..fb7d9f92af 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -121,8 +121,7 @@ static int TocEntrySizeCompare(const void *p1, const void
*p2);
static void move_to_ready_list(TocEntry *pending_list,
ParallelReadyList
*ready_list,
RestorePass pass);
-static TocEntry *pop_next_work_item(ArchiveHandle *AH,
-
ParallelReadyList *ready_list,
+static TocEntry *pop_next_work_item(ParallelReadyList *ready_list,
ParallelState *pstate);
static void mark_dump_job_done(ArchiveHandle *AH,
TocEntry *te,
@@ -4077,7 +4076,7 @@ restore_toc_entries_parallel(ArchiveHandle *AH,
ParallelState *pstate,
for (;;)
{
/* Look for an item ready to be dispatched to a worker */
- next_work_item = pop_next_work_item(AH, &ready_list, pstate);
+ next_work_item = pop_next_work_item(&ready_list, pstate);
if (next_work_item != NULL)
{
/* If not to be restored, don't waste time launching a
worker */
@@ -4383,7 +4382,7 @@ move_to_ready_list(TocEntry *pending_list,
* no remaining dependencies, but we have to check for lock conflicts.
*/
static TocEntry *
-pop_next_work_item(ArchiveHandle *AH, ParallelReadyList *ready_list,
+pop_next_work_item(ParallelReadyList *ready_list,
ParallelState *pstate)
{
/*
--
2.28.0
From d0231d3a65d4c22541bd741748fc159ffac2d3b8 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 04/11] Remove unused parameter
never used (added by 500b62b0570f29c708083a8f64988329bfaec5d5)
---
src/bin/pg_dump/pg_backup_archiver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/pg_dump/pg_backup_archiver.c
b/src/bin/pg_dump/pg_backup_archiver.c
index fb7d9f92af..88afb0eb5a 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -91,7 +91,7 @@ static bool _tocEntryIsACL(TocEntry *te);
static void _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te);
static void _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te);
static void buildTocEntryArrays(ArchiveHandle *AH);
-static void _moveBefore(ArchiveHandle *AH, TocEntry *pos, TocEntry *te);
+static void _moveBefore(TocEntry *pos, TocEntry *te);
static int _discoverArchiveFormat(ArchiveHandle *AH);
static int RestoringToDB(ArchiveHandle *AH);
@@ -1441,7 +1441,7 @@ SortTocFromFile(Archive *AHX)
* side-effects on the order in which restorable items actually
get
* restored.
*/
- _moveBefore(AH, AH->toc, te);
+ _moveBefore(AH->toc, te);
}
if (fclose(fh) != 0)
@@ -1803,7 +1803,7 @@ _moveAfter(ArchiveHandle *AH, TocEntry *pos, TocEntry *te)
#endif
static void
-_moveBefore(ArchiveHandle *AH, TocEntry *pos, TocEntry *te)
+_moveBefore(TocEntry *pos, TocEntry *te)
{
/* Unlink te from list */
te->prev->next = te->next;
--
2.28.0
From 42325b920cb9a7d74cef1e6be5e6f4bcee73126a Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 05/11] Remove unused parameter
unused since 808f8f5d6da5c79ed10bbe9f721215279a81d1eb
---
src/bin/pg_dump/pg_backup_archiver.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bin/pg_dump/pg_backup_archiver.c
b/src/bin/pg_dump/pg_backup_archiver.c
index 88afb0eb5a..539b9df72d 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -70,8 +70,7 @@ typedef struct _parallelReadyList
static ArchiveHandle *_allocAH(const char *FileSpec, const ArchiveFormat fmt,
const int
compression, bool dosync, ArchiveMode mode,
SetupWorkerPtrType
setupWorkerPtr);
-static void _getObjectDescription(PQExpBuffer buf, TocEntry *te,
- ArchiveHandle
*AH);
+static void _getObjectDescription(PQExpBuffer buf, TocEntry *te);
static void _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData);
static char *sanitize_line(const char *str, bool want_hyphen);
static void _doSetFixedOutputState(ArchiveHandle *AH);
@@ -3463,7 +3462,7 @@ _selectTableAccessMethod(ArchiveHandle *AH, const char
*tableam)
* This is used for ALTER ... OWNER TO.
*/
static void
-_getObjectDescription(PQExpBuffer buf, TocEntry *te, ArchiveHandle *AH)
+_getObjectDescription(PQExpBuffer buf, TocEntry *te)
{
const char *type = te->desc;
@@ -3672,7 +3671,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool
isData)
PQExpBuffer temp = createPQExpBuffer();
appendPQExpBufferStr(temp, "ALTER ");
- _getObjectDescription(temp, te, AH);
+ _getObjectDescription(temp, te);
appendPQExpBuffer(temp, " OWNER TO %s;",
fmtId(te->owner));
ahprintf(AH, "%s\n\n", temp->data);
destroyPQExpBuffer(temp);
--
2.28.0
From 6dbae2f39b818ea4e006019090f3c315d7b1dca9 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 06/11] Remove unused parameter
unused since 3c0afde11a12bb3ca7c68a30ad0dedaa0d1adef5
---
src/bin/pg_dump/pg_backup_tar.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index c601ec0701..54e708875c 100644
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -107,7 +107,7 @@ static void tarClose(ArchiveHandle *AH, TAR_MEMBER *TH);
#ifdef __NOT_USED__
static char *tarGets(char *buf, size_t len, TAR_MEMBER *th);
#endif
-static int tarPrintf(ArchiveHandle *AH, TAR_MEMBER *th, const char
*fmt,...) pg_attribute_printf(3, 4);
+static int tarPrintf(TAR_MEMBER *th, const char *fmt,...)
pg_attribute_printf(2, 3);
static void _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th);
static TAR_MEMBER *_tarPositionTo(ArchiveHandle *AH, const char *filename);
@@ -851,7 +851,7 @@ _CloseArchive(ArchiveHandle *AH)
*/
th = tarOpen(AH, "restore.sql", 'w');
- tarPrintf(AH, th, "--\n"
+ tarPrintf(th, "--\n"
"-- NOTE:\n"
"--\n"
"-- File paths need to be edited. Search for
$$PATH$$ and\n"
@@ -964,7 +964,7 @@ _StartBlob(ArchiveHandle *AH, TocEntry *te, Oid oid)
sprintf(fname, "blob_%u.dat%s", oid, sfx);
- tarPrintf(AH, ctx->blobToc, "%u %s\n", oid, fname);
+ tarPrintf(ctx->blobToc, "%u %s\n", oid, fname);
tctx->TH = tarOpen(AH, fname, 'w');
}
@@ -1008,7 +1008,7 @@ _EndBlobs(ArchiveHandle *AH, TocEntry *te)
*/
static int
-tarPrintf(ArchiveHandle *AH, TAR_MEMBER *th, const char *fmt,...)
+tarPrintf(TAR_MEMBER *th, const char *fmt,...)
{
int save_errno = errno;
char *p;
--
2.28.0
From 7156bfe25b861e5d4b9467ea13e54096e4b14c76 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 07/11] Remove unused parameters
unused since 64f3524e2c8deebc02808aa5ebdfa17859473add
---
src/bin/pg_dump/pg_dump.c | 69 +++++++++++++++------------------------
1 file changed, 27 insertions(+), 42 deletions(-)
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 2cb3f9b083..63c0d84746 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -157,7 +157,7 @@ static void expand_table_name_patterns(Archive *fout,
SimpleStringList *patterns,
SimpleOidList *oids,
bool
strict_names);
-static NamespaceInfo *findNamespace(Archive *fout, Oid nsoid);
+static NamespaceInfo *findNamespace(Oid nsoid);
static void dumpTableData(Archive *fout, TableDataInfo *tdinfo);
static void refreshMatViewData(Archive *fout, TableDataInfo *tdinfo);
static void guessConstraintInheritance(TableInfo *tblinfo, int numTables);
@@ -250,9 +250,8 @@ static char *format_function_arguments_old(Archive *fout,
char **argnames);
static char *format_function_signature(Archive *fout,
FuncInfo *finfo, bool honor_quotes);
-static char *convertRegProcReference(Archive *fout,
- const
char *proc);
-static char *getFormattedOperatorName(Archive *fout, const char *oproid);
+static char *convertRegProcReference(const char *proc);
+static char *getFormattedOperatorName(const char *oproid);
static char *convertTSFunction(Archive *fout, Oid funcOid);
static Oid findLastBuiltinOid_V71(Archive *fout);
static char *getFormattedTypeName(Archive *fout, Oid oid, OidOptions opts);
@@ -4795,7 +4794,7 @@ getNamespaces(Archive *fout, int *numNamespaces)
* given a namespace OID, look up the info read by getNamespaces
*/
static NamespaceInfo *
-findNamespace(Archive *fout, Oid nsoid)
+findNamespace(Oid nsoid)
{
NamespaceInfo *nsinfo;
@@ -5053,8 +5052,7 @@ getTypes(Archive *fout, int *numTypes)
AssignDumpId(&tyinfo[i].dobj);
tyinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_typname));
tyinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_typnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_typnamespace)));
tyinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
tyinfo[i].typacl = pg_strdup(PQgetvalue(res, i, i_typacl));
tyinfo[i].rtypacl = pg_strdup(PQgetvalue(res, i, i_rtypacl));
@@ -5198,8 +5196,7 @@ getOperators(Archive *fout, int *numOprs)
AssignDumpId(&oprinfo[i].dobj);
oprinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_oprname));
oprinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_oprnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_oprnamespace)));
oprinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
oprinfo[i].oprkind = (PQgetvalue(res, i, i_oprkind))[0];
oprinfo[i].oprcode = atooid(PQgetvalue(res, i, i_oprcode));
@@ -5284,8 +5281,7 @@ getCollations(Archive *fout, int *numCollations)
AssignDumpId(&collinfo[i].dobj);
collinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i,
i_collname));
collinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_collnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_collnamespace)));
collinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
/* Decide whether we want to dump it */
@@ -5357,8 +5353,7 @@ getConversions(Archive *fout, int *numConversions)
AssignDumpId(&convinfo[i].dobj);
convinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i,
i_conname));
convinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_connamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_connamespace)));
convinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
/* Decide whether we want to dump it */
@@ -5502,8 +5497,7 @@ getOpclasses(Archive *fout, int *numOpclasses)
AssignDumpId(&opcinfo[i].dobj);
opcinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_opcname));
opcinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_opcnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_opcnamespace)));
opcinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
/* Decide whether we want to dump it */
@@ -5586,8 +5580,7 @@ getOpfamilies(Archive *fout, int *numOpfamilies)
AssignDumpId(&opfinfo[i].dobj);
opfinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_opfname));
opfinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_opfnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_opfnamespace)));
opfinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
/* Decide whether we want to dump it */
@@ -5762,8 +5755,7 @@ getAggregates(Archive *fout, int *numAggs)
AssignDumpId(&agginfo[i].aggfn.dobj);
agginfo[i].aggfn.dobj.name = pg_strdup(PQgetvalue(res, i,
i_aggname));
agginfo[i].aggfn.dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_aggnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_aggnamespace)));
agginfo[i].aggfn.rolname = pg_strdup(PQgetvalue(res, i,
i_rolname));
if (strlen(agginfo[i].aggfn.rolname) == 0)
pg_log_warning("owner of aggregate function \"%s\"
appears to be invalid",
@@ -5997,8 +5989,7 @@ getFuncs(Archive *fout, int *numFuncs)
AssignDumpId(&finfo[i].dobj);
finfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_proname));
finfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_pronamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_pronamespace)));
finfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
finfo[i].lang = atooid(PQgetvalue(res, i, i_prolang));
finfo[i].prorettype = atooid(PQgetvalue(res, i, i_prorettype));
@@ -6735,8 +6726,7 @@ getTables(Archive *fout, int *numTables)
AssignDumpId(&tblinfo[i].dobj);
tblinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_relname));
tblinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_relnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_relnamespace)));
tblinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
tblinfo[i].relacl = pg_strdup(PQgetvalue(res, i, i_relacl));
tblinfo[i].rrelacl = pg_strdup(PQgetvalue(res, i, i_rrelacl));
@@ -7397,8 +7387,7 @@ getExtendedStatistics(Archive *fout)
AssignDumpId(&statsextinfo[i].dobj);
statsextinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i,
i_stxname));
statsextinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_stxnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_stxnamespace)));
statsextinfo[i].rolname = pg_strdup(PQgetvalue(res, i,
i_rolname));
statsextinfo[i].stattarget = atoi(PQgetvalue(res, i,
i_stattarget));
@@ -8934,8 +8923,7 @@ getTSParsers(Archive *fout, int *numTSParsers)
AssignDumpId(&prsinfo[i].dobj);
prsinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_prsname));
prsinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_prsnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_prsnamespace)));
prsinfo[i].prsstart = atooid(PQgetvalue(res, i, i_prsstart));
prsinfo[i].prstoken = atooid(PQgetvalue(res, i, i_prstoken));
prsinfo[i].prsend = atooid(PQgetvalue(res, i, i_prsend));
@@ -9017,8 +9005,7 @@ getTSDictionaries(Archive *fout, int *numTSDicts)
AssignDumpId(&dictinfo[i].dobj);
dictinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i,
i_dictname));
dictinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_dictnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_dictnamespace)));
dictinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
dictinfo[i].dicttemplate = atooid(PQgetvalue(res, i,
i_dicttemplate));
if (PQgetisnull(res, i, i_dictinitoption))
@@ -9097,8 +9084,7 @@ getTSTemplates(Archive *fout, int *numTSTemplates)
AssignDumpId(&tmplinfo[i].dobj);
tmplinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i,
i_tmplname));
tmplinfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_tmplnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_tmplnamespace)));
tmplinfo[i].tmplinit = atooid(PQgetvalue(res, i, i_tmplinit));
tmplinfo[i].tmpllexize = atooid(PQgetvalue(res, i,
i_tmpllexize));
@@ -9174,8 +9160,7 @@ getTSConfigurations(Archive *fout, int *numTSConfigs)
AssignDumpId(&cfginfo[i].dobj);
cfginfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_cfgname));
cfginfo[i].dobj.namespace =
- findNamespace(fout,
- atooid(PQgetvalue(res, i,
i_cfgnamespace)));
+ findNamespace(atooid(PQgetvalue(res, i,
i_cfgnamespace)));
cfginfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
cfginfo[i].cfgparser = atooid(PQgetvalue(res, i, i_cfgparser));
@@ -9622,7 +9607,7 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
daclinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i,
i_defaclobjtype));
if (nspid != InvalidOid)
- daclinfo[i].dobj.namespace = findNamespace(fout, nspid);
+ daclinfo[i].dobj.namespace = findNamespace(nspid);
else
daclinfo[i].dobj.namespace = NULL;
@@ -12632,7 +12617,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
oprcanmerge = PQgetvalue(res, 0, i_oprcanmerge);
oprcanhash = PQgetvalue(res, 0, i_oprcanhash);
- oprregproc = convertRegProcReference(fout, oprcode);
+ oprregproc = convertRegProcReference(oprcode);
if (oprregproc)
{
appendPQExpBuffer(details, " FUNCTION = %s", oprregproc);
@@ -12664,14 +12649,14 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
else
appendPQExpBufferStr(oprid, ", NONE)");
- oprref = getFormattedOperatorName(fout, oprcom);
+ oprref = getFormattedOperatorName(oprcom);
if (oprref)
{
appendPQExpBuffer(details, ",\n COMMUTATOR = %s", oprref);
free(oprref);
}
- oprref = getFormattedOperatorName(fout, oprnegate);
+ oprref = getFormattedOperatorName(oprnegate);
if (oprref)
{
appendPQExpBuffer(details, ",\n NEGATOR = %s", oprref);
@@ -12684,14 +12669,14 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
if (strcmp(oprcanhash, "t") == 0)
appendPQExpBufferStr(details, ",\n HASHES");
- oprregproc = convertRegProcReference(fout, oprrest);
+ oprregproc = convertRegProcReference(oprrest);
if (oprregproc)
{
appendPQExpBuffer(details, ",\n RESTRICT = %s", oprregproc);
free(oprregproc);
}
- oprregproc = convertRegProcReference(fout, oprjoin);
+ oprregproc = convertRegProcReference(oprjoin);
if (oprregproc)
{
appendPQExpBuffer(details, ",\n JOIN = %s", oprregproc);
@@ -12746,7 +12731,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
* part.
*/
static char *
-convertRegProcReference(Archive *fout, const char *proc)
+convertRegProcReference(const char *proc)
{
char *name;
char *paren;
@@ -12787,7 +12772,7 @@ convertRegProcReference(Archive *fout, const char *proc)
* are in different schemas.
*/
static char *
-getFormattedOperatorName(Archive *fout, const char *oproid)
+getFormattedOperatorName(const char *oproid)
{
OprInfo *oprInfo;
@@ -14097,7 +14082,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
}
}
- aggsortconvop = getFormattedOperatorName(fout, aggsortop);
+ aggsortconvop = getFormattedOperatorName(aggsortop);
if (aggsortconvop)
{
appendPQExpBuffer(details, ",\n SORTOP = %s",
--
2.28.0
From ade00e1cfb0ce872800fa228163b30fbc2963368 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 08/11] Remove unused parameter
unused since the beginning (463f2625a5fb183b6a8925ccde98bb3889f921d9)
---
src/bin/pg_dump/dumputils.c | 2 +-
src/bin/pg_dump/dumputils.h | 2 +-
src/bin/pg_dump/pg_dump.c | 2 +-
src/bin/pg_dump/pg_dumpall.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
index 287d485d5f..2d6ea13c45 100644
--- a/src/bin/pg_dump/dumputils.c
+++ b/src/bin/pg_dump/dumputils.c
@@ -685,7 +685,7 @@ AddAcl(PQExpBuffer aclbuf, const char *keyword, const char
*subname)
* keep this file free of assumptions about how to deal with SQL errors.)
*/
void
-buildShSecLabelQuery(PGconn *conn, const char *catalog_name, Oid objectId,
+buildShSecLabelQuery(const char *catalog_name, Oid objectId,
PQExpBuffer sql)
{
appendPQExpBuffer(sql,
diff --git a/src/bin/pg_dump/dumputils.h b/src/bin/pg_dump/dumputils.h
index cb1d98d873..d35d9d34d2 100644
--- a/src/bin/pg_dump/dumputils.h
+++ b/src/bin/pg_dump/dumputils.h
@@ -46,7 +46,7 @@ extern bool buildDefaultACLCommands(const char *type, const
char *nspname,
const
char *owner,
int
remoteVersion,
PQExpBuffer sql);
-extern void buildShSecLabelQuery(PGconn *conn, const char *catalog_name,
+extern void buildShSecLabelQuery(const char *catalog_name,
Oid objectId,
PQExpBuffer sql);
extern void emitShSecLabels(PGconn *conn, PGresult *res,
PQExpBuffer buffer,
const char *objtype, const char *objname);
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 63c0d84746..a8cf4bbab8 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -2971,7 +2971,7 @@ dumpDatabase(Archive *fout)
seclabelQry = createPQExpBuffer();
- buildShSecLabelQuery(conn, "pg_database", dbCatId.oid,
seclabelQry);
+ buildShSecLabelQuery("pg_database", dbCatId.oid, seclabelQry);
shres = ExecuteSqlQuery(fout, seclabelQry->data,
PGRES_TUPLES_OK);
resetPQExpBuffer(seclabelQry);
emitShSecLabels(conn, shres, seclabelQry, "DATABASE", datname);
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 2c82b39af0..1c898acb2c 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -1613,7 +1613,7 @@ buildShSecLabels(PGconn *conn, const char *catalog_name,
Oid objectId,
PQExpBuffer sql = createPQExpBuffer();
PGresult *res;
- buildShSecLabelQuery(conn, catalog_name, objectId, sql);
+ buildShSecLabelQuery(catalog_name, objectId, sql);
res = executeQuery(conn, sql->data);
emitShSecLabels(conn, res, buffer, objtype, objname);
--
2.28.0
From 09db00571773c0468a8285040c6e2a16cb0f4ff7 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 09/11] Remove unused parameter
unused since 93ee38eade1b2b4964354b95b01b09e17d6f098d
---
contrib/pageinspect/btreefuncs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index e7a323044b..445605db58 100644
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -259,7 +259,7 @@ struct user_args
* ------------------------------------------------------
*/
static Datum
-bt_page_print_tuples(FuncCallContext *fctx, struct user_args *uargs)
+bt_page_print_tuples(struct user_args *uargs)
{
Page page = uargs->page;
OffsetNumber offset = uargs->offset;
@@ -498,7 +498,7 @@ bt_page_items(PG_FUNCTION_ARGS)
if (fctx->call_cntr < fctx->max_calls)
{
- result = bt_page_print_tuples(fctx, uargs);
+ result = bt_page_print_tuples(uargs);
uargs->offset++;
SRF_RETURN_NEXT(fctx, result);
}
@@ -582,7 +582,7 @@ bt_page_items_bytea(PG_FUNCTION_ARGS)
if (fctx->call_cntr < fctx->max_calls)
{
- result = bt_page_print_tuples(fctx, uargs);
+ result = bt_page_print_tuples(uargs);
uargs->offset++;
SRF_RETURN_NEXT(fctx, result);
}
--
2.28.0
From e162a3599949ff8943d75212744ff63c9927d12d Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 10/11] Remove unused parameter
unused since f0d6f20278b7c5c412ce40a9b86c6b31dc2fbfdd
---
contrib/pg_stat_statements/pg_stat_statements.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c
b/contrib/pg_stat_statements/pg_stat_statements.c
index 6b91c62c31..1eac9edaee 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -376,7 +376,7 @@ static void JumbleRowMarks(pgssJumbleState *jstate, List
*rowMarks);
static void JumbleExpr(pgssJumbleState *jstate, Node *node);
static void RecordConstLocation(pgssJumbleState *jstate, int location);
static char *generate_normalized_query(pgssJumbleState *jstate, const char
*query,
- int
query_loc, int *query_len_p, int encoding);
+ int
query_loc, int *query_len_p);
static void fill_in_constant_lengths(pgssJumbleState *jstate, const char
*query,
int
query_loc);
static int comp_location(const void *a, const void *b);
@@ -1336,8 +1336,7 @@ pgss_store(const char *query, uint64 queryId,
LWLockRelease(pgss->lock);
norm_query = generate_normalized_query(jstate, query,
query_location,
-
&query_len,
-
encoding);
+
&query_len);
LWLockAcquire(pgss->lock, LW_SHARED);
}
@@ -3235,7 +3234,7 @@ RecordConstLocation(pgssJumbleState *jstate, int location)
*/
static char *
generate_normalized_query(pgssJumbleState *jstate, const char *query,
- int query_loc, int
*query_len_p, int encoding)
+ int query_loc, int
*query_len_p)
{
char *norm_query;
int query_len = *query_len_p;
--
2.28.0
From 4278e092f0154d1fe876d516b3eff746d9317b00 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Tue, 25 Aug 2020 07:24:15 +0200
Subject: [PATCH 11/11] Remove unused parameter
unused since 84d723b6cefcf25b8c800f8aa6cf3c9538a546b4
---
contrib/tablefunc/tablefunc.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 3802ae905e..02f02eab57 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -49,7 +49,6 @@ static HTAB *load_categories_hash(char *cats_sql,
MemoryContext per_query_ctx);
static Tuplestorestate *get_crosstab_tuplestore(char *sql,
HTAB *crosstab_hash,
TupleDesc tupdesc,
-
MemoryContext per_query_ctx,
bool randomAccess);
static void validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch,
bool show_serial);
static bool compatCrosstabTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2);
@@ -680,7 +679,6 @@ crosstab_hash(PG_FUNCTION_ARGS)
rsinfo->setResult = get_crosstab_tuplestore(sql,
crosstab_hash,
tupdesc,
-
per_query_ctx,
rsinfo->allowedModes & SFRM_Materialize_Random);
/*
@@ -793,7 +791,6 @@ static Tuplestorestate *
get_crosstab_tuplestore(char *sql,
HTAB *crosstab_hash,
TupleDesc tupdesc,
- MemoryContext per_query_ctx,
bool randomAccess)
{
Tuplestorestate *tupstore;
--
2.28.0
