Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit20e69da

Browse files
Harmonize parameter names in pg_dump/pg_dumpall.
Make sure that function declarations use names that exactly match thecorresponding names from function definitions in pg_dump/pg_dumpallrelated code.Affected code happens to be inconsistent in how it applies conventionsaround how Archive and Archive Handle variables are named. Significantcode churn is required to fully fix those inconsistencies, so take theleast invasive approach possible: treat function definition names asauthoritative, and mechanically adjust corresponding names from functiondefinitions to match.Like other recent commits that cleaned up function parameter names, thiscommit 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 parent0faf7d9 commit20e69da

File tree

9 files changed

+24
-22
lines changed

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
staticcatalogid_hash*catalogIdHash=NULL;
8181

82-
staticvoidflagInhTables(Archive*fout,TableInfo*tbinfo,intnumTables,
82+
staticvoidflagInhTables(Archive*fout,TableInfo*tblinfo,intnumTables,
8383
InhInfo*inhinfo,intnumInherits);
8484
staticvoidflagInhIndexes(Archive*fout,TableInfo*tblinfo,intnumTables);
8585
staticvoidflagInhAttrs(DumpOptions*dopt,TableInfo*tblinfo,intnumTables);

‎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
externPGconn*GetConnection(Archive*AHX);
286286

287287
/* Called to write *data* to the archive */
288-
externvoidWriteData(Archive*AH,constvoid*data,size_tdLen);
288+
externvoidWriteData(Archive*AHX,constvoid*data,size_tdLen);
289289

290-
externintStartBlob(Archive*AH,Oidoid);
291-
externintEndBlob(Archive*AH,Oidoid);
290+
externintStartBlob(Archive*AHX,Oidoid);
291+
externintEndBlob(Archive*AHX,Oidoid);
292292

293-
externvoidCloseArchive(Archive*AH);
293+
externvoidCloseArchive(Archive*AHX);
294294

295295
externvoidSetArchiveOptions(Archive*AH,DumpOptions*dopt,RestoreOptions*ropt);
296296

297-
externvoidProcessArchiveRestoreOptions(Archive*AH);
297+
externvoidProcessArchiveRestoreOptions(Archive*AHX);
298298

299-
externvoidRestoreArchive(Archive*AH);
299+
externvoidRestoreArchive(Archive*AHX);
300300

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

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

312312
externRestoreOptions*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
externsize_tWriteInt(ArchiveHandle*AH,inti);
458458
externintReadInt(ArchiveHandle*AH);
459459
externchar*ReadStr(ArchiveHandle*AH);
460-
externsize_tWriteStr(ArchiveHandle*AH,constchar*s);
460+
externsize_tWriteStr(ArchiveHandle*AH,constchar*c);
461461

462462
intReadOffset(ArchiveHandle*,pgoff_t*);
463463
size_tWriteOffset(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
staticvoid_WriteData(ArchiveHandle*AH,constvoid*data,size_tdLen);
4141
staticvoid_EndData(ArchiveHandle*AH,TocEntry*te);
4242
staticint_WriteByte(ArchiveHandle*AH,constinti);
43-
staticint_ReadByte(ArchiveHandle*);
43+
staticint_ReadByte(ArchiveHandle*AH);
4444
staticvoid_WriteBuf(ArchiveHandle*AH,constvoid*buf,size_tlen);
4545
staticvoid_ReadBuf(ArchiveHandle*AH,void*buf,size_tlen);
4646
staticvoid_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
staticvoid_EndData(ArchiveHandle*AH,TocEntry*te);
6868
staticvoid_WriteData(ArchiveHandle*AH,constvoid*data,size_tdLen);
6969
staticint_WriteByte(ArchiveHandle*AH,constinti);
70-
staticint_ReadByte(ArchiveHandle*);
70+
staticint_ReadByte(ArchiveHandle*AH);
7171
staticvoid_WriteBuf(ArchiveHandle*AH,constvoid*buf,size_tlen);
7272
staticvoid_ReadBuf(ArchiveHandle*AH,void*buf,size_tlen);
7373
staticvoid_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
staticvoid_WriteData(ArchiveHandle*AH,constvoid*data,size_tdLen);
4747
staticvoid_EndData(ArchiveHandle*AH,TocEntry*te);
4848
staticint_WriteByte(ArchiveHandle*AH,constinti);
49-
staticint_ReadByte(ArchiveHandle*);
49+
staticint_ReadByte(ArchiveHandle*AH);
5050
staticvoid_WriteBuf(ArchiveHandle*AH,constvoid*buf,size_tlen);
5151
staticvoid_ReadBuf(ArchiveHandle*AH,void*buf,size_tlen);
5252
staticvoid_CloseArchive(ArchiveHandle*AH);
@@ -97,7 +97,7 @@ typedef struct
9797
staticvoid_LoadBlobs(ArchiveHandle*AH);
9898

9999
staticTAR_MEMBER*tarOpen(ArchiveHandle*AH,constchar*filename,charmode);
100-
staticvoidtarClose(ArchiveHandle*AH,TAR_MEMBER*TH);
100+
staticvoidtarClose(ArchiveHandle*AH,TAR_MEMBER*th);
101101

102102
#ifdef__NOT_USED__
103103
staticchar*tarGets(char*buf,size_tlen,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
externExtensionInfo*getExtensions(Archive*fout,int*numExtensions);
706706
externTypeInfo*getTypes(Archive*fout,int*numTypes);
707707
externFuncInfo*getFuncs(Archive*fout,int*numFuncs);
708-
externAggInfo*getAggregates(Archive*fout,int*numAggregates);
709-
externOprInfo*getOperators(Archive*fout,int*numOperators);
708+
externAggInfo*getAggregates(Archive*fout,int*numAggs);
709+
externOprInfo*getOperators(Archive*fout,int*numOprs);
710710
externAccessMethodInfo*getAccessMethods(Archive*fout,int*numAccessMethods);
711711
externOpclassInfo*getOpclasses(Archive*fout,int*numOpclasses);
712712
externOpfamilyInfo*getOpfamilies(Archive*fout,int*numOpfamilies);
@@ -723,7 +723,7 @@ extern void getTriggers(Archive *fout, TableInfo tblinfo[], int numTables);
723723
externProcLangInfo*getProcLangs(Archive*fout,int*numProcLangs);
724724
externCastInfo*getCasts(Archive*fout,int*numCasts);
725725
externTransformInfo*getTransforms(Archive*fout,int*numTransforms);
726-
externvoidgetTableAttrs(Archive*fout,TableInfo*tbinfo,intnumTables);
726+
externvoidgetTableAttrs(Archive*fout,TableInfo*tblinfo,intnumTables);
727727
externboolshouldPrintColumn(constDumpOptions*dopt,constTableInfo*tbinfo,intcolno);
728728
externTSParserInfo*getTSParsers(Archive*fout,int*numTSParsers);
729729
externTSDictInfo*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
constchar*catalog_name,OidobjectId,
7373
constchar*objtype,constchar*objname,
7474
PQExpBufferbuffer);
75-
staticPGconn*connectDatabase(constchar*dbname,constchar*connstr,constchar*pghost,constchar*pgport,
76-
constchar*pguser,trivalueprompt_password,boolfail_on_error);
75+
staticPGconn*connectDatabase(constchar*dbname,
76+
constchar*connection_string,constchar*pghost,
77+
constchar*pgport,constchar*pguser,
78+
trivalueprompt_password,boolfail_on_error);
7779
staticchar*constructConnStr(constchar**keywords,constchar**values);
7880
staticPGresult*executeQuery(PGconn*conn,constchar*query);
7981
staticvoidexecuteCommand(PGconn*conn,constchar*query);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp