Skip to content

Commit 20e69da

Browse files
petergeogheganpetergeoghegan
committed
Harmonize parameter names in pg_dump/pg_dumpall.
Make sure that function declarations use names that exactly match the corresponding names from function definitions in pg_dump/pg_dumpall related code. Affected code happens to be inconsistent in how it applies conventions around how Archive and Archive Handle variables are named. Significant code churn is required to fully fix those inconsistencies, so take the least invasive approach possible: treat function definition names as authoritative, and mechanically adjust corresponding names from function definitions to match. Like other recent commits that cleaned up function parameter names, this commit was written with help from clang-tidy. Author: Peter Geoghegan <pg@bowt.ie> Reviewed-By: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/CAH2-Wzmma+vzcO6gr5NYDZ+sx0G14aU-UrzFutT2FoRaisVCUQ@mail.gmail.com
1 parent 0faf7d9 commit 20e69da

9 files changed

+24
-22
lines changed

‎src/bin/pg_dump/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ typedef struct _catalogIdMapEntry
7979

8080
static catalogid_hash *catalogIdHash = NULL;
8181

82-
static void flagInhTables(Archive *fout, TableInfo *tbinfo, int numTables,
82+
static void flagInhTables(Archive *fout, TableInfo *tblinfo, int numTables,
8383
InhInfo *inhinfo, int numInherits);
8484
static void flagInhIndexes(Archive *fout, TableInfo *tblinfo, int numTables);
8585
static void flagInhAttrs(DumpOptions *dopt, TableInfo *tblinfo, int numTables);

‎src/bin/pg_dump/pg_backup.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -285,18 +285,18 @@ extern void DisconnectDatabase(Archive *AHX);
285285
extern PGconn *GetConnection(Archive *AHX);
286286

287287
/* Called to write *data* to the archive */
288-
extern void WriteData(Archive *AH, const void *data, size_t dLen);
288+
extern void WriteData(Archive *AHX, const void *data, size_t dLen);
289289

290-
extern int StartBlob(Archive *AH, Oid oid);
291-
extern int EndBlob(Archive *AH, Oid oid);
290+
extern int StartBlob(Archive *AHX, Oid oid);
291+
extern int EndBlob(Archive *AHX, Oid oid);
292292

293-
extern void CloseArchive(Archive *AH);
293+
extern void CloseArchive(Archive *AHX);
294294

295295
extern void SetArchiveOptions(Archive *AH, DumpOptions *dopt, RestoreOptions *ropt);
296296

297-
extern void ProcessArchiveRestoreOptions(Archive *AH);
297+
extern void ProcessArchiveRestoreOptions(Archive *AHX);
298298

299-
extern void RestoreArchive(Archive *AH);
299+
extern void RestoreArchive(Archive *AHX);
300300

301301
/* Open an existing archive */
302302
extern Archive *OpenArchive(const char *FileSpec, const ArchiveFormat fmt);
@@ -307,7 +307,7 @@ extern Archive *CreateArchive(const char *FileSpec, const ArchiveFormat fmt,
307307
SetupWorkerPtrType setupDumpWorker);
308308

309309
/* The --list option */
310-
extern void PrintTOCSummary(Archive *AH);
310+
extern void PrintTOCSummary(Archive *AHX);
311311

312312
extern RestoreOptions *NewRestoreOptions(void);
313313

‎src/bin/pg_dump/pg_backup_archiver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ extern bool checkSeek(FILE *fp);
457457
extern size_t WriteInt(ArchiveHandle *AH, int i);
458458
extern int ReadInt(ArchiveHandle *AH);
459459
extern char *ReadStr(ArchiveHandle *AH);
460-
extern size_t WriteStr(ArchiveHandle *AH, const char *s);
460+
extern size_t WriteStr(ArchiveHandle *AH, const char *c);
461461

462462
int ReadOffset(ArchiveHandle *, pgoff_t *);
463463
size_t WriteOffset(ArchiveHandle *, pgoff_t, int);

‎src/bin/pg_dump/pg_backup_custom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static void _StartData(ArchiveHandle *AH, TocEntry *te);
4040
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
4141
static void _EndData(ArchiveHandle *AH, TocEntry *te);
4242
static int _WriteByte(ArchiveHandle *AH, const int i);
43-
static int _ReadByte(ArchiveHandle *);
43+
static int _ReadByte(ArchiveHandle *AH);
4444
static void _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len);
4545
static void _ReadBuf(ArchiveHandle *AH, void *buf, size_t len);
4646
static void _CloseArchive(ArchiveHandle *AH);

‎src/bin/pg_dump/pg_backup_directory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static void _StartData(ArchiveHandle *AH, TocEntry *te);
6767
static void _EndData(ArchiveHandle *AH, TocEntry *te);
6868
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
6969
static int _WriteByte(ArchiveHandle *AH, const int i);
70-
static int _ReadByte(ArchiveHandle *);
70+
static int _ReadByte(ArchiveHandle *AH);
7171
static void _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len);
7272
static void _ReadBuf(ArchiveHandle *AH, void *buf, size_t len);
7373
static void _CloseArchive(ArchiveHandle *AH);

‎src/bin/pg_dump/pg_backup_tar.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void _StartData(ArchiveHandle *AH, TocEntry *te);
4646
static void _WriteData(ArchiveHandle *AH, const void *data, size_t dLen);
4747
static void _EndData(ArchiveHandle *AH, TocEntry *te);
4848
static int _WriteByte(ArchiveHandle *AH, const int i);
49-
static int _ReadByte(ArchiveHandle *);
49+
static int _ReadByte(ArchiveHandle *AH);
5050
static void _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len);
5151
static void _ReadBuf(ArchiveHandle *AH, void *buf, size_t len);
5252
static void _CloseArchive(ArchiveHandle *AH);
@@ -97,7 +97,7 @@ typedef struct
9797
static void _LoadBlobs(ArchiveHandle *AH);
9898

9999
static TAR_MEMBER *tarOpen(ArchiveHandle *AH, const char *filename, char mode);
100-
static void tarClose(ArchiveHandle *AH, TAR_MEMBER *TH);
100+
static void tarClose(ArchiveHandle *AH, TAR_MEMBER *th);
101101

102102
#ifdef __NOT_USED__
103103
static char *tarGets(char *buf, size_t len, TAR_MEMBER *th);

‎src/bin/pg_dump/pg_dump.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static void dumpFunc(Archive *fout, const FuncInfo *finfo);
221221
static void dumpCast(Archive *fout, const CastInfo *cast);
222222
static void dumpTransform(Archive *fout, const TransformInfo *transform);
223223
static void dumpOpr(Archive *fout, const OprInfo *oprinfo);
224-
static void dumpAccessMethod(Archive *fout, const AccessMethodInfo *oprinfo);
224+
static void dumpAccessMethod(Archive *fout, const AccessMethodInfo *aminfo);
225225
static void dumpOpclass(Archive *fout, const OpclassInfo *opcinfo);
226226
static void dumpOpfamily(Archive *fout, const OpfamilyInfo *opfinfo);
227227
static void dumpCollation(Archive *fout, const CollInfo *collinfo);
@@ -232,7 +232,7 @@ static void dumpTrigger(Archive *fout, const TriggerInfo *tginfo);
232232
static void dumpEventTrigger(Archive *fout, const EventTriggerInfo *evtinfo);
233233
static void dumpTable(Archive *fout, const TableInfo *tbinfo);
234234
static void dumpTableSchema(Archive *fout, const TableInfo *tbinfo);
235-
static void dumpTableAttach(Archive *fout, const TableAttachInfo *tbinfo);
235+
static void dumpTableAttach(Archive *fout, const TableAttachInfo *attachinfo);
236236
static void dumpAttrDef(Archive *fout, const AttrDefInfo *adinfo);
237237
static void dumpSequence(Archive *fout, const TableInfo *tbinfo);
238238
static void dumpSequenceData(Archive *fout, const TableDataInfo *tdinfo);
@@ -287,7 +287,7 @@ static void dumpPolicy(Archive *fout, const PolicyInfo *polinfo);
287287
static void dumpPublication(Archive *fout, const PublicationInfo *pubinfo);
288288
static void dumpPublicationTable(Archive *fout, const PublicationRelInfo *pubrinfo);
289289
static void dumpSubscription(Archive *fout, const SubscriptionInfo *subinfo);
290-
static void dumpDatabase(Archive *AH);
290+
static void dumpDatabase(Archive *fout);
291291
static void dumpDatabaseConfig(Archive *AH, PQExpBuffer outbuf,
292292
const char *dbname, Oid dboid);
293293
static void dumpEncoding(Archive *AH);
@@ -315,7 +315,7 @@ static bool nonemptyReloptions(const char *reloptions);
315315
static void appendReloptionsArrayAH(PQExpBuffer buffer, const char *reloptions,
316316
const char *prefix, Archive *fout);
317317
static char *get_synchronized_snapshot(Archive *fout);
318-
static void setupDumpWorker(Archive *AHX);
318+
static void setupDumpWorker(Archive *AH);
319319
static TableInfo *getRootTableInfo(const TableInfo *tbinfo);
320320

321321

‎src/bin/pg_dump/pg_dump.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,8 +705,8 @@ extern NamespaceInfo *getNamespaces(Archive *fout, int *numNamespaces);
705705
extern ExtensionInfo *getExtensions(Archive *fout, int *numExtensions);
706706
extern TypeInfo *getTypes(Archive *fout, int *numTypes);
707707
extern FuncInfo *getFuncs(Archive *fout, int *numFuncs);
708-
extern AggInfo *getAggregates(Archive *fout, int *numAggregates);
709-
extern OprInfo *getOperators(Archive *fout, int *numOperators);
708+
extern AggInfo *getAggregates(Archive *fout, int *numAggs);
709+
extern OprInfo *getOperators(Archive *fout, int *numOprs);
710710
extern AccessMethodInfo *getAccessMethods(Archive *fout, int *numAccessMethods);
711711
extern OpclassInfo *getOpclasses(Archive *fout, int *numOpclasses);
712712
extern OpfamilyInfo *getOpfamilies(Archive *fout, int *numOpfamilies);
@@ -723,7 +723,7 @@ extern void getTriggers(Archive *fout, TableInfo tblinfo[], int numTables);
723723
extern ProcLangInfo *getProcLangs(Archive *fout, int *numProcLangs);
724724
extern CastInfo *getCasts(Archive *fout, int *numCasts);
725725
extern TransformInfo *getTransforms(Archive *fout, int *numTransforms);
726-
extern void getTableAttrs(Archive *fout, TableInfo *tbinfo, int numTables);
726+
extern void getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables);
727727
extern bool shouldPrintColumn(const DumpOptions *dopt, const TableInfo *tbinfo, int colno);
728728
extern TSParserInfo *getTSParsers(Archive *fout, int *numTSParsers);
729729
extern TSDictInfo *getTSDictionaries(Archive *fout, int *numTSDicts);

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ static void buildShSecLabels(PGconn *conn,
7272
const char *catalog_name, Oid objectId,
7373
const char *objtype, const char *objname,
7474
PQExpBuffer buffer);
75-
static PGconn *connectDatabase(const char *dbname, const char *connstr, const char *pghost, const char *pgport,
76-
const char *pguser, trivalue prompt_password, bool fail_on_error);
75+
static PGconn *connectDatabase(const char *dbname,
76+
const char *connection_string, const char *pghost,
77+
const char *pgport, const char *pguser,
78+
trivalue prompt_password, bool fail_on_error);
7779
static char *constructConnStr(const char **keywords, const char **values);
7880
static PGresult *executeQuery(PGconn *conn, const char *query);
7981
static void executeCommand(PGconn *conn, const char *query);

0 commit comments

Comments
 (0)