@@ -157,7 +157,7 @@ static void expand_table_name_patterns(Archive *fout,
157
157
SimpleStringList *patterns,
158
158
SimpleOidList *oids,
159
159
bool strict_names);
160
- static NamespaceInfo *findNamespace(Archive *fout, Oid nsoid);
160
+ static NamespaceInfo *findNamespace(Oid nsoid);
161
161
static void dumpTableData(Archive *fout, TableDataInfo *tdinfo);
162
162
static void refreshMatViewData(Archive *fout, TableDataInfo *tdinfo);
163
163
static void guessConstraintInheritance(TableInfo *tblinfo, int numTables);
@@ -250,9 +250,8 @@ static char *format_function_arguments_old(Archive *fout,
250
250
char **argnames);
251
251
static char *format_function_signature(Archive *fout,
252
252
FuncInfo *finfo, bool honor_quotes);
253
- static char *convertRegProcReference(Archive *fout,
254
- const char *proc);
255
- static char *getFormattedOperatorName(Archive *fout, const char *oproid);
253
+ static char *convertRegProcReference(const char *proc);
254
+ static char *getFormattedOperatorName(const char *oproid);
256
255
static char *convertTSFunction(Archive *fout, Oid funcOid);
257
256
static Oid findLastBuiltinOid_V71(Archive *fout);
258
257
static char *getFormattedTypeName(Archive *fout, Oid oid, OidOptions opts);
@@ -2974,7 +2973,7 @@ dumpDatabase(Archive *fout)
2974
2973
2975
2974
seclabelQry = createPQExpBuffer();
2976
2975
2977
- buildShSecLabelQuery(conn, "pg_database", dbCatId.oid, seclabelQry);
2976
+ buildShSecLabelQuery("pg_database", dbCatId.oid, seclabelQry);
2978
2977
shres = ExecuteSqlQuery(fout, seclabelQry->data, PGRES_TUPLES_OK);
2979
2978
resetPQExpBuffer(seclabelQry);
2980
2979
emitShSecLabels(conn, shres, seclabelQry, "DATABASE", datname);
@@ -4811,7 +4810,7 @@ getNamespaces(Archive *fout, int *numNamespaces)
4811
4810
* given a namespace OID, look up the info read by getNamespaces
4812
4811
*/
4813
4812
static NamespaceInfo *
4814
- findNamespace(Archive *fout, Oid nsoid)
4813
+ findNamespace(Oid nsoid)
4815
4814
{
4816
4815
NamespaceInfo *nsinfo;
4817
4816
@@ -5069,8 +5068,7 @@ getTypes(Archive *fout, int *numTypes)
5069
5068
AssignDumpId(&tyinfo[i].dobj);
5070
5069
tyinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_typname));
5071
5070
tyinfo[i].dobj.namespace =
5072
- findNamespace(fout,
5073
- atooid(PQgetvalue(res, i, i_typnamespace)));
5071
+ findNamespace(atooid(PQgetvalue(res, i, i_typnamespace)));
5074
5072
tyinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
5075
5073
tyinfo[i].typacl = pg_strdup(PQgetvalue(res, i, i_typacl));
5076
5074
tyinfo[i].rtypacl = pg_strdup(PQgetvalue(res, i, i_rtypacl));
@@ -5214,8 +5212,7 @@ getOperators(Archive *fout, int *numOprs)
5214
5212
AssignDumpId(&oprinfo[i].dobj);
5215
5213
oprinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_oprname));
5216
5214
oprinfo[i].dobj.namespace =
5217
- findNamespace(fout,
5218
- atooid(PQgetvalue(res, i, i_oprnamespace)));
5215
+ findNamespace(atooid(PQgetvalue(res, i, i_oprnamespace)));
5219
5216
oprinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
5220
5217
oprinfo[i].oprkind = (PQgetvalue(res, i, i_oprkind))[0];
5221
5218
oprinfo[i].oprcode = atooid(PQgetvalue(res, i, i_oprcode));
@@ -5300,8 +5297,7 @@ getCollations(Archive *fout, int *numCollations)
5300
5297
AssignDumpId(&collinfo[i].dobj);
5301
5298
collinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_collname));
5302
5299
collinfo[i].dobj.namespace =
5303
- findNamespace(fout,
5304
- atooid(PQgetvalue(res, i, i_collnamespace)));
5300
+ findNamespace(atooid(PQgetvalue(res, i, i_collnamespace)));
5305
5301
collinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
5306
5302
5307
5303
/* Decide whether we want to dump it */
@@ -5373,8 +5369,7 @@ getConversions(Archive *fout, int *numConversions)
5373
5369
AssignDumpId(&convinfo[i].dobj);
5374
5370
convinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_conname));
5375
5371
convinfo[i].dobj.namespace =
5376
- findNamespace(fout,
5377
- atooid(PQgetvalue(res, i, i_connamespace)));
5372
+ findNamespace(atooid(PQgetvalue(res, i, i_connamespace)));
5378
5373
convinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
5379
5374
5380
5375
/* Decide whether we want to dump it */
@@ -5518,8 +5513,7 @@ getOpclasses(Archive *fout, int *numOpclasses)
5518
5513
AssignDumpId(&opcinfo[i].dobj);
5519
5514
opcinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_opcname));
5520
5515
opcinfo[i].dobj.namespace =
5521
- findNamespace(fout,
5522
- atooid(PQgetvalue(res, i, i_opcnamespace)));
5516
+ findNamespace(atooid(PQgetvalue(res, i, i_opcnamespace)));
5523
5517
opcinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
5524
5518
5525
5519
/* Decide whether we want to dump it */
@@ -5602,8 +5596,7 @@ getOpfamilies(Archive *fout, int *numOpfamilies)
5602
5596
AssignDumpId(&opfinfo[i].dobj);
5603
5597
opfinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_opfname));
5604
5598
opfinfo[i].dobj.namespace =
5605
- findNamespace(fout,
5606
- atooid(PQgetvalue(res, i, i_opfnamespace)));
5599
+ findNamespace(atooid(PQgetvalue(res, i, i_opfnamespace)));
5607
5600
opfinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
5608
5601
5609
5602
/* Decide whether we want to dump it */
@@ -5778,8 +5771,7 @@ getAggregates(Archive *fout, int *numAggs)
5778
5771
AssignDumpId(&agginfo[i].aggfn.dobj);
5779
5772
agginfo[i].aggfn.dobj.name = pg_strdup(PQgetvalue(res, i, i_aggname));
5780
5773
agginfo[i].aggfn.dobj.namespace =
5781
- findNamespace(fout,
5782
- atooid(PQgetvalue(res, i, i_aggnamespace)));
5774
+ findNamespace(atooid(PQgetvalue(res, i, i_aggnamespace)));
5783
5775
agginfo[i].aggfn.rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
5784
5776
if (strlen(agginfo[i].aggfn.rolname) == 0)
5785
5777
pg_log_warning("owner of aggregate function \"%s\" appears to be invalid",
@@ -6013,8 +6005,7 @@ getFuncs(Archive *fout, int *numFuncs)
6013
6005
AssignDumpId(&finfo[i].dobj);
6014
6006
finfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_proname));
6015
6007
finfo[i].dobj.namespace =
6016
- findNamespace(fout,
6017
- atooid(PQgetvalue(res, i, i_pronamespace)));
6008
+ findNamespace(atooid(PQgetvalue(res, i, i_pronamespace)));
6018
6009
finfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
6019
6010
finfo[i].lang = atooid(PQgetvalue(res, i, i_prolang));
6020
6011
finfo[i].prorettype = atooid(PQgetvalue(res, i, i_prorettype));
@@ -6751,8 +6742,7 @@ getTables(Archive *fout, int *numTables)
6751
6742
AssignDumpId(&tblinfo[i].dobj);
6752
6743
tblinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_relname));
6753
6744
tblinfo[i].dobj.namespace =
6754
- findNamespace(fout,
6755
- atooid(PQgetvalue(res, i, i_relnamespace)));
6745
+ findNamespace(atooid(PQgetvalue(res, i, i_relnamespace)));
6756
6746
tblinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
6757
6747
tblinfo[i].relacl = pg_strdup(PQgetvalue(res, i, i_relacl));
6758
6748
tblinfo[i].rrelacl = pg_strdup(PQgetvalue(res, i, i_rrelacl));
@@ -7413,8 +7403,7 @@ getExtendedStatistics(Archive *fout)
7413
7403
AssignDumpId(&statsextinfo[i].dobj);
7414
7404
statsextinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_stxname));
7415
7405
statsextinfo[i].dobj.namespace =
7416
- findNamespace(fout,
7417
- atooid(PQgetvalue(res, i, i_stxnamespace)));
7406
+ findNamespace(atooid(PQgetvalue(res, i, i_stxnamespace)));
7418
7407
statsextinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
7419
7408
statsextinfo[i].stattarget = atoi(PQgetvalue(res, i, i_stattarget));
7420
7409
@@ -8952,8 +8941,7 @@ getTSParsers(Archive *fout, int *numTSParsers)
8952
8941
AssignDumpId(&prsinfo[i].dobj);
8953
8942
prsinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_prsname));
8954
8943
prsinfo[i].dobj.namespace =
8955
- findNamespace(fout,
8956
- atooid(PQgetvalue(res, i, i_prsnamespace)));
8944
+ findNamespace(atooid(PQgetvalue(res, i, i_prsnamespace)));
8957
8945
prsinfo[i].prsstart = atooid(PQgetvalue(res, i, i_prsstart));
8958
8946
prsinfo[i].prstoken = atooid(PQgetvalue(res, i, i_prstoken));
8959
8947
prsinfo[i].prsend = atooid(PQgetvalue(res, i, i_prsend));
@@ -9035,8 +9023,7 @@ getTSDictionaries(Archive *fout, int *numTSDicts)
9035
9023
AssignDumpId(&dictinfo[i].dobj);
9036
9024
dictinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_dictname));
9037
9025
dictinfo[i].dobj.namespace =
9038
- findNamespace(fout,
9039
- atooid(PQgetvalue(res, i, i_dictnamespace)));
9026
+ findNamespace(atooid(PQgetvalue(res, i, i_dictnamespace)));
9040
9027
dictinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
9041
9028
dictinfo[i].dicttemplate = atooid(PQgetvalue(res, i, i_dicttemplate));
9042
9029
if (PQgetisnull(res, i, i_dictinitoption))
@@ -9115,8 +9102,7 @@ getTSTemplates(Archive *fout, int *numTSTemplates)
9115
9102
AssignDumpId(&tmplinfo[i].dobj);
9116
9103
tmplinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_tmplname));
9117
9104
tmplinfo[i].dobj.namespace =
9118
- findNamespace(fout,
9119
- atooid(PQgetvalue(res, i, i_tmplnamespace)));
9105
+ findNamespace(atooid(PQgetvalue(res, i, i_tmplnamespace)));
9120
9106
tmplinfo[i].tmplinit = atooid(PQgetvalue(res, i, i_tmplinit));
9121
9107
tmplinfo[i].tmpllexize = atooid(PQgetvalue(res, i, i_tmpllexize));
9122
9108
@@ -9192,8 +9178,7 @@ getTSConfigurations(Archive *fout, int *numTSConfigs)
9192
9178
AssignDumpId(&cfginfo[i].dobj);
9193
9179
cfginfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_cfgname));
9194
9180
cfginfo[i].dobj.namespace =
9195
- findNamespace(fout,
9196
- atooid(PQgetvalue(res, i, i_cfgnamespace)));
9181
+ findNamespace(atooid(PQgetvalue(res, i, i_cfgnamespace)));
9197
9182
cfginfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
9198
9183
cfginfo[i].cfgparser = atooid(PQgetvalue(res, i, i_cfgparser));
9199
9184
@@ -9640,7 +9625,7 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
9640
9625
daclinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_defaclobjtype));
9641
9626
9642
9627
if (nspid != InvalidOid)
9643
- daclinfo[i].dobj.namespace = findNamespace(fout, nspid);
9628
+ daclinfo[i].dobj.namespace = findNamespace(nspid);
9644
9629
else
9645
9630
daclinfo[i].dobj.namespace = NULL;
9646
9631
@@ -12655,7 +12640,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
12655
12640
pg_log_warning("postfix operators are not supported anymore (operator \"%s\")",
12656
12641
oprcode);
12657
12642
12658
- oprregproc = convertRegProcReference(fout, oprcode);
12643
+ oprregproc = convertRegProcReference(oprcode);
12659
12644
if (oprregproc)
12660
12645
{
12661
12646
appendPQExpBuffer(details, " FUNCTION = %s", oprregproc);
@@ -12688,14 +12673,14 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
12688
12673
else
12689
12674
appendPQExpBufferStr(oprid, ", NONE)");
12690
12675
12691
- oprref = getFormattedOperatorName(fout, oprcom);
12676
+ oprref = getFormattedOperatorName(oprcom);
12692
12677
if (oprref)
12693
12678
{
12694
12679
appendPQExpBuffer(details, ",\n COMMUTATOR = %s", oprref);
12695
12680
free(oprref);
12696
12681
}
12697
12682
12698
- oprref = getFormattedOperatorName(fout, oprnegate);
12683
+ oprref = getFormattedOperatorName(oprnegate);
12699
12684
if (oprref)
12700
12685
{
12701
12686
appendPQExpBuffer(details, ",\n NEGATOR = %s", oprref);
@@ -12708,14 +12693,14 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
12708
12693
if (strcmp(oprcanhash, "t") == 0)
12709
12694
appendPQExpBufferStr(details, ",\n HASHES");
12710
12695
12711
- oprregproc = convertRegProcReference(fout, oprrest);
12696
+ oprregproc = convertRegProcReference(oprrest);
12712
12697
if (oprregproc)
12713
12698
{
12714
12699
appendPQExpBuffer(details, ",\n RESTRICT = %s", oprregproc);
12715
12700
free(oprregproc);
12716
12701
}
12717
12702
12718
- oprregproc = convertRegProcReference(fout, oprjoin);
12703
+ oprregproc = convertRegProcReference(oprjoin);
12719
12704
if (oprregproc)
12720
12705
{
12721
12706
appendPQExpBuffer(details, ",\n JOIN = %s", oprregproc);
@@ -12770,7 +12755,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
12770
12755
* part.
12771
12756
*/
12772
12757
static char *
12773
- convertRegProcReference(Archive *fout, const char *proc)
12758
+ convertRegProcReference(const char *proc)
12774
12759
{
12775
12760
char *name;
12776
12761
char *paren;
@@ -12811,7 +12796,7 @@ convertRegProcReference(Archive *fout, const char *proc)
12811
12796
* are in different schemas.
12812
12797
*/
12813
12798
static char *
12814
- getFormattedOperatorName(Archive *fout, const char *oproid)
12799
+ getFormattedOperatorName(const char *oproid)
12815
12800
{
12816
12801
OprInfo *oprInfo;
12817
12802
@@ -14121,7 +14106,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
14121
14106
}
14122
14107
}
14123
14108
14124
- aggsortconvop = getFormattedOperatorName(fout, aggsortop);
14109
+ aggsortconvop = getFormattedOperatorName(aggsortop);
14125
14110
if (aggsortconvop)
14126
14111
{
14127
14112
appendPQExpBuffer(details, ",\n SORTOP = %s",
0 commit comments