pg_verifybackup: Move skip_checksums into verifier_context.

This is in preparation for adding a second source file to this
directory. It will need access to this value. Also, fewer global
variables 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

diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c
index d77e70fbe3874e2a44390b811d9e70f1e001f8e2..4f19aea9d35e4396dc0da9adff4be70aa2556066 100644 (file)
--- a/src/bin/pg_verifybackup/pg_verifybackup.c
+++ b/src/bin/pg_verifybackup/pg_verifybackup.c
@@ -113,6 +113,7 @@ typedef struct verifier_context
        manifest_data *manifest;
        char       *backup_directory;
        SimpleStringList ignore_list;
+       bool            skip_checksums;
        bool            exit_on_error;
        bool            saw_any_error;
 } verifier_context;
@@ -162,9 +163,8 @@ static void usage(void);
 
 static const char *progname;
 
-/* options */
+/* is progress reporting enabled? */
 static bool show_progress = false;
-static bool skip_checksums = false;
 
 /* Progress indicators */
 static uint64 total_size = 0;
@@ -266,7 +266,7 @@ main(int argc, char **argv)
                                quiet = true;
                                break;
                        case 's':
-                               skip_checksums = true;
+                               context.skip_checksums = true;
                                break;
                        case 'w':
                                wal_directory = pstrdup(optarg);
@@ -363,7 +363,7 @@ main(int argc, char **argv)
         * Now do the expensive work of verifying file checksums, unless we were
         * told to skip it.
         */
-       if (!skip_checksums)
+       if (!context.skip_checksums)
                verify_backup_checksums(&context);
 
        /*
@@ -739,7 +739,8 @@ verify_backup_file(verifier_context *context, char *relpath, char *fullpath)
                verify_control_file(fullpath, context->manifest->system_identifier);
 
        /* Update statistics for progress report, if necessary */
-       if (show_progress && !skip_checksums && should_verify_checksum(m))
+       if (show_progress && !context->skip_checksums &&
+               should_verify_checksum(m))
                total_size += m->size;
 
        /*