@@ -157,7 +157,7 @@ static void expand_table_name_patterns(Archive *fout,
157157 SimpleStringList *patterns,
158158 SimpleOidList *oids,
159159 bool strict_names);
160- static NamespaceInfo *findNamespace(Archive *fout, Oid nsoid);
160+ static NamespaceInfo *findNamespace(Oid nsoid);
161161static void dumpTableData(Archive *fout, TableDataInfo *tdinfo);
162162static void refreshMatViewData(Archive *fout, TableDataInfo *tdinfo);
163163static void guessConstraintInheritance(TableInfo *tblinfo, int numTables);
@@ -250,9 +250,8 @@ static char *format_function_arguments_old(Archive *fout,
250250 char **argnames);
251251static char *format_function_signature(Archive *fout,
252252 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);
256255static char *convertTSFunction(Archive *fout, Oid funcOid);
257256static OidfindLastBuiltinOid_V71(Archive *fout);
258257static char *getFormattedTypeName(Archive *fout, Oid oid, OidOptions opts);
@@ -2974,7 +2973,7 @@ dumpDatabase(Archive *fout)
29742973
29752974seclabelQry = createPQExpBuffer();
29762975
2977- buildShSecLabelQuery(conn, "pg_database", dbCatId.oid, seclabelQry);
2976+ buildShSecLabelQuery("pg_database", dbCatId.oid, seclabelQry);
29782977shres = ExecuteSqlQuery(fout, seclabelQry->data, PGRES_TUPLES_OK);
29792978resetPQExpBuffer(seclabelQry);
29802979emitShSecLabels(conn, shres, seclabelQry, "DATABASE", datname);
@@ -4811,7 +4810,7 @@ getNamespaces(Archive *fout, int *numNamespaces)
48114810 *given a namespace OID, look up the info read by getNamespaces
48124811 */
48134812static NamespaceInfo *
4814- findNamespace(Archive *fout, Oid nsoid)
4813+ findNamespace(Oid nsoid)
48154814{
48164815NamespaceInfo *nsinfo;
48174816
@@ -5069,8 +5068,7 @@ getTypes(Archive *fout, int *numTypes)
50695068AssignDumpId(&tyinfo[i].dobj);
50705069tyinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_typname));
50715070tyinfo[i].dobj.namespace =
5072- findNamespace(fout,
5073- atooid(PQgetvalue(res, i, i_typnamespace)));
5071+ findNamespace(atooid(PQgetvalue(res, i, i_typnamespace)));
50745072tyinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
50755073tyinfo[i].typacl = pg_strdup(PQgetvalue(res, i, i_typacl));
50765074tyinfo[i].rtypacl = pg_strdup(PQgetvalue(res, i, i_rtypacl));
@@ -5214,8 +5212,7 @@ getOperators(Archive *fout, int *numOprs)
52145212AssignDumpId(&oprinfo[i].dobj);
52155213oprinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_oprname));
52165214oprinfo[i].dobj.namespace =
5217- findNamespace(fout,
5218- atooid(PQgetvalue(res, i, i_oprnamespace)));
5215+ findNamespace(atooid(PQgetvalue(res, i, i_oprnamespace)));
52195216oprinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
52205217oprinfo[i].oprkind = (PQgetvalue(res, i, i_oprkind))[0];
52215218oprinfo[i].oprcode = atooid(PQgetvalue(res, i, i_oprcode));
@@ -5300,8 +5297,7 @@ getCollations(Archive *fout, int *numCollations)
53005297AssignDumpId(&collinfo[i].dobj);
53015298collinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_collname));
53025299collinfo[i].dobj.namespace =
5303- findNamespace(fout,
5304- atooid(PQgetvalue(res, i, i_collnamespace)));
5300+ findNamespace(atooid(PQgetvalue(res, i, i_collnamespace)));
53055301collinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
53065302
53075303/* Decide whether we want to dump it */
@@ -5373,8 +5369,7 @@ getConversions(Archive *fout, int *numConversions)
53735369AssignDumpId(&convinfo[i].dobj);
53745370convinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_conname));
53755371convinfo[i].dobj.namespace =
5376- findNamespace(fout,
5377- atooid(PQgetvalue(res, i, i_connamespace)));
5372+ findNamespace(atooid(PQgetvalue(res, i, i_connamespace)));
53785373convinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
53795374
53805375/* Decide whether we want to dump it */
@@ -5518,8 +5513,7 @@ getOpclasses(Archive *fout, int *numOpclasses)
55185513AssignDumpId(&opcinfo[i].dobj);
55195514opcinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_opcname));
55205515opcinfo[i].dobj.namespace =
5521- findNamespace(fout,
5522- atooid(PQgetvalue(res, i, i_opcnamespace)));
5516+ findNamespace(atooid(PQgetvalue(res, i, i_opcnamespace)));
55235517opcinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
55245518
55255519/* Decide whether we want to dump it */
@@ -5602,8 +5596,7 @@ getOpfamilies(Archive *fout, int *numOpfamilies)
56025596AssignDumpId(&opfinfo[i].dobj);
56035597opfinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_opfname));
56045598opfinfo[i].dobj.namespace =
5605- findNamespace(fout,
5606- atooid(PQgetvalue(res, i, i_opfnamespace)));
5599+ findNamespace(atooid(PQgetvalue(res, i, i_opfnamespace)));
56075600opfinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
56085601
56095602/* Decide whether we want to dump it */
@@ -5778,8 +5771,7 @@ getAggregates(Archive *fout, int *numAggs)
57785771AssignDumpId(&agginfo[i].aggfn.dobj);
57795772agginfo[i].aggfn.dobj.name = pg_strdup(PQgetvalue(res, i, i_aggname));
57805773agginfo[i].aggfn.dobj.namespace =
5781- findNamespace(fout,
5782- atooid(PQgetvalue(res, i, i_aggnamespace)));
5774+ findNamespace(atooid(PQgetvalue(res, i, i_aggnamespace)));
57835775agginfo[i].aggfn.rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
57845776if (strlen(agginfo[i].aggfn.rolname) == 0)
57855777pg_log_warning("owner of aggregate function \"%s\" appears to be invalid",
@@ -6013,8 +6005,7 @@ getFuncs(Archive *fout, int *numFuncs)
60136005AssignDumpId(&finfo[i].dobj);
60146006finfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_proname));
60156007finfo[i].dobj.namespace =
6016- findNamespace(fout,
6017- atooid(PQgetvalue(res, i, i_pronamespace)));
6008+ findNamespace(atooid(PQgetvalue(res, i, i_pronamespace)));
60186009finfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
60196010finfo[i].lang = atooid(PQgetvalue(res, i, i_prolang));
60206011finfo[i].prorettype = atooid(PQgetvalue(res, i, i_prorettype));
@@ -6751,8 +6742,7 @@ getTables(Archive *fout, int *numTables)
67516742AssignDumpId(&tblinfo[i].dobj);
67526743tblinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_relname));
67536744tblinfo[i].dobj.namespace =
6754- findNamespace(fout,
6755- atooid(PQgetvalue(res, i, i_relnamespace)));
6745+ findNamespace(atooid(PQgetvalue(res, i, i_relnamespace)));
67566746tblinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
67576747tblinfo[i].relacl = pg_strdup(PQgetvalue(res, i, i_relacl));
67586748tblinfo[i].rrelacl = pg_strdup(PQgetvalue(res, i, i_rrelacl));
@@ -7413,8 +7403,7 @@ getExtendedStatistics(Archive *fout)
74137403AssignDumpId(&statsextinfo[i].dobj);
74147404statsextinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_stxname));
74157405statsextinfo[i].dobj.namespace =
7416- findNamespace(fout,
7417- atooid(PQgetvalue(res, i, i_stxnamespace)));
7406+ findNamespace(atooid(PQgetvalue(res, i, i_stxnamespace)));
74187407statsextinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
74197408statsextinfo[i].stattarget = atoi(PQgetvalue(res, i, i_stattarget));
74207409
@@ -8952,8 +8941,7 @@ getTSParsers(Archive *fout, int *numTSParsers)
89528941AssignDumpId(&prsinfo[i].dobj);
89538942prsinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_prsname));
89548943prsinfo[i].dobj.namespace =
8955- findNamespace(fout,
8956- atooid(PQgetvalue(res, i, i_prsnamespace)));
8944+ findNamespace(atooid(PQgetvalue(res, i, i_prsnamespace)));
89578945prsinfo[i].prsstart = atooid(PQgetvalue(res, i, i_prsstart));
89588946prsinfo[i].prstoken = atooid(PQgetvalue(res, i, i_prstoken));
89598947prsinfo[i].prsend = atooid(PQgetvalue(res, i, i_prsend));
@@ -9035,8 +9023,7 @@ getTSDictionaries(Archive *fout, int *numTSDicts)
90359023AssignDumpId(&dictinfo[i].dobj);
90369024dictinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_dictname));
90379025dictinfo[i].dobj.namespace =
9038- findNamespace(fout,
9039- atooid(PQgetvalue(res, i, i_dictnamespace)));
9026+ findNamespace(atooid(PQgetvalue(res, i, i_dictnamespace)));
90409027dictinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
90419028dictinfo[i].dicttemplate = atooid(PQgetvalue(res, i, i_dicttemplate));
90429029if (PQgetisnull(res, i, i_dictinitoption))
@@ -9115,8 +9102,7 @@ getTSTemplates(Archive *fout, int *numTSTemplates)
91159102AssignDumpId(&tmplinfo[i].dobj);
91169103tmplinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_tmplname));
91179104tmplinfo[i].dobj.namespace =
9118- findNamespace(fout,
9119- atooid(PQgetvalue(res, i, i_tmplnamespace)));
9105+ findNamespace(atooid(PQgetvalue(res, i, i_tmplnamespace)));
91209106tmplinfo[i].tmplinit = atooid(PQgetvalue(res, i, i_tmplinit));
91219107tmplinfo[i].tmpllexize = atooid(PQgetvalue(res, i, i_tmpllexize));
91229108
@@ -9192,8 +9178,7 @@ getTSConfigurations(Archive *fout, int *numTSConfigs)
91929178AssignDumpId(&cfginfo[i].dobj);
91939179cfginfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_cfgname));
91949180cfginfo[i].dobj.namespace =
9195- findNamespace(fout,
9196- atooid(PQgetvalue(res, i, i_cfgnamespace)));
9181+ findNamespace(atooid(PQgetvalue(res, i, i_cfgnamespace)));
91979182cfginfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
91989183cfginfo[i].cfgparser = atooid(PQgetvalue(res, i, i_cfgparser));
91999184
@@ -9640,7 +9625,7 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
96409625daclinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_defaclobjtype));
96419626
96429627if (nspid != InvalidOid)
9643- daclinfo[i].dobj.namespace = findNamespace(fout, nspid);
9628+ daclinfo[i].dobj.namespace = findNamespace(nspid);
96449629else
96459630daclinfo[i].dobj.namespace = NULL;
96469631
@@ -12655,7 +12640,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
1265512640pg_log_warning("postfix operators are not supported anymore (operator \"%s\")",
1265612641 oprcode);
1265712642
12658- oprregproc = convertRegProcReference(fout, oprcode);
12643+ oprregproc = convertRegProcReference(oprcode);
1265912644if (oprregproc)
1266012645{
1266112646appendPQExpBuffer(details, " FUNCTION = %s", oprregproc);
@@ -12688,14 +12673,14 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
1268812673else
1268912674appendPQExpBufferStr(oprid, ", NONE)");
1269012675
12691- oprref = getFormattedOperatorName(fout, oprcom);
12676+ oprref = getFormattedOperatorName(oprcom);
1269212677if (oprref)
1269312678{
1269412679appendPQExpBuffer(details, ",\n COMMUTATOR = %s", oprref);
1269512680free(oprref);
1269612681}
1269712682
12698- oprref = getFormattedOperatorName(fout, oprnegate);
12683+ oprref = getFormattedOperatorName(oprnegate);
1269912684if (oprref)
1270012685{
1270112686appendPQExpBuffer(details, ",\n NEGATOR = %s", oprref);
@@ -12708,14 +12693,14 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
1270812693if (strcmp(oprcanhash, "t") == 0)
1270912694appendPQExpBufferStr(details, ",\n HASHES");
1271012695
12711- oprregproc = convertRegProcReference(fout, oprrest);
12696+ oprregproc = convertRegProcReference(oprrest);
1271212697if (oprregproc)
1271312698{
1271412699appendPQExpBuffer(details, ",\n RESTRICT = %s", oprregproc);
1271512700free(oprregproc);
1271612701}
1271712702
12718- oprregproc = convertRegProcReference(fout, oprjoin);
12703+ oprregproc = convertRegProcReference(oprjoin);
1271912704if (oprregproc)
1272012705{
1272112706appendPQExpBuffer(details, ",\n JOIN = %s", oprregproc);
@@ -12770,7 +12755,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
1277012755 * part.
1277112756 */
1277212757static char *
12773- convertRegProcReference(Archive *fout, const char *proc)
12758+ convertRegProcReference(const char *proc)
1277412759{
1277512760char *name;
1277612761char *paren;
@@ -12811,7 +12796,7 @@ convertRegProcReference(Archive *fout, const char *proc)
1281112796 * are in different schemas.
1281212797 */
1281312798static char *
12814- getFormattedOperatorName(Archive *fout, const char *oproid)
12799+ getFormattedOperatorName(const char *oproid)
1281512800{
1281612801OprInfo *oprInfo;
1281712802
@@ -14121,7 +14106,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
1412114106}
1412214107}
1412314108
14124- aggsortconvop = getFormattedOperatorName(fout, aggsortop);
14109+ aggsortconvop = getFormattedOperatorName(aggsortop);
1412514110if (aggsortconvop)
1412614111{
1412714112appendPQExpBuffer(details, ",\n SORTOP = %s",