NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitaf99d44

committed

pg_verifybackup: Move skip_checksums into verifier_context.

This is in preparation for adding a second source file to thisdirectory. It will need access to this value. Also, fewer globalvariables is usually a good thing.Amul Sul, reviewed by Sravan Kumar and revised a bit by me.Discussion:http://postgr.es/m/CAAJ_b95mcGjkfAf1qduOR97CokW8-_i-dWLm3v6x1w2-OW9M+A@mail.gmail.com

1 parent76dd015 commitaf99d44Copy full SHA for af99d44

File tree

1 file changed

-5

lines changed

src/bin/pg_verifybackup
- pg_verifybackup.c

1 file changed

-5

lines changed

`‎src/bin/pg_verifybackup/pg_verifybackup.c`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ typedef struct verifier_context`
`113`	`113`	`manifest_data*manifest;`
`114`	`114`	`char*backup_directory;`
`115`	`115`	`SimpleStringListignore_list;`
	`116`	`+boolskip_checksums;`
`116`	`117`	`boolexit_on_error;`
`117`	`118`	`boolsaw_any_error;`
`118`	`119`	`}verifier_context;`
`@@ -162,9 +163,8 @@ static void usage(void);`
`162`	`163`
`163`	`164`	`staticconstchar*progname;`
`164`	`165`
`165`		`-/options /`
	`166`	`+/is progress reporting enabled? /`
`166`	`167`	`staticboolshow_progress= false;`
`167`		`-staticboolskip_checksums= false;`
`168`	`168`
`169`	`169`	`/* Progress indicators */`
`170`	`170`	`staticuint64total_size=0;`
`@@ -266,7 +266,7 @@ main(int argc, char **argv)`
`266`	`266`	`quiet= true;`
`267`	`267`	`break;`
`268`	`268`	`case's':`
`269`		`-skip_checksums= true;`
	`269`	`+context.skip_checksums= true;`
`270`	`270`	`break;`
`271`	`271`	`case'w':`
`272`	`272`	`wal_directory=pstrdup(optarg);`
`@@ -363,7 +363,7 @@ main(int argc, char **argv)`
`363`	`363`	`* Now do the expensive work of verifying file checksums, unless we were`
`364`	`364`	`* told to skip it.`
`365`	`365`	`*/`
`366`		`-if (!skip_checksums)`
	`366`	`+if (!context.skip_checksums)`
`367`	`367`	`verify_backup_checksums(&context);`
`368`	`368`
`369`	`369`	`/*`
`@@ -739,7 +739,8 @@ verify_backup_file(verifier_context context, char relpath, char *fullpath)`
`739`	`739`	`verify_control_file(fullpath,context->manifest->system_identifier);`
`740`	`740`
`741`	`741`	`/* Update statistics for progress report, if necessary */`
`742`		`-if (show_progress&& !skip_checksums&&should_verify_checksum(m))`
	`742`	`+if (show_progress&& !context->skip_checksums&&`
	`743`	`+should_verify_checksum(m))`
`743`	`744`	`total_size+=m->size;`
`744`	`745`
`745`	`746`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitaf99d44

File tree

1 file changed

1 file changed

`‎src/bin/pg_verifybackup/pg_verifybackup.c`

0 commit comments