PGPRO-2065: minor fixes for checkdb

gsmolk · gsmolk · commit 252176bb9b62 · 2019-04-02T17:16:08.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -2666,8 +2666,6 @@ check_indexes(void *arg)
 
 		if (arguments->backup_conn == NULL)
 		{
-			PGresult   *res;
-			char		*query;
 
 			arguments->backup_conn = pgut_connect(instance_config.pghost,
 												instance_config.pgport,
@@ -3479,7 +3477,6 @@ get_index_list(PGresult *res_db, int db_number,
 {
 	PGresult   *res;
 	char *nspname = NULL;
-	char *snapshot = NULL;
 	int i;
 
 	dbname = PQgetvalue(res_db, db_number, 0);
diff --git a/src/help.c b/src/help.c
@@ -22,6 +22,7 @@ static void help_add_instance(void);
 static void help_del_instance(void);
 static void help_archive_push(void);
 static void help_archive_get(void);
+static void help_checkdb(void);
 
 void
 help_command(char *command)
@@ -52,6 +53,8 @@ help_command(char *command)
 		help_archive_push();
 	else if (strcmp(command, "archive-get") == 0)
 		help_archive_get();
+	else if (strcmp(command, "checkdb") == 0)
+		help_checkdb();
 	else if (strcmp(command, "--help") == 0
 			 || strcmp(command, "help") == 0
 			 || strcmp(command, "-?") == 0
@@ -416,11 +419,11 @@ help_checkdb(void)
 	printf(_("      --progress                   show progress\n"));
 	printf(_("  -j, --threads=NUM                number of parallel threads\n"));
 	printf(_("      --skip-block-validation      skip file-level block checking\n"));
-	printf(_("                                   can be used only with --amcheck option\n"));
+	printf(_("                                   can be used only with '--amcheck' option\n"));
 	printf(_("      --amcheck                    in addition to file-level block checking\n"));
-	printf(_("                                   check btree indexes using 'amcheck' or 'amcheck_next' extension"));
+	printf(_("                                   check btree indexes using 'amcheck' or 'amcheck_next' extension\n"));
 	printf(_("      --heapallindexed             also check that heap is indexed\n"));
-	printf(_("                                   can be used only with --amcheck option\n"));
+	printf(_("                                   can be used only with '--amcheck' option\n"));
 
 	printf(_("\n  Logging options:\n"));
 	printf(_("      --log-level-console=log-level-console\n"));

Original file line number	Diff line number	Diff line change
`@@ -2666,8 +2666,6 @@ check_indexes(void *arg)`
`2666`	`2666`
`2667`	`2667`	`if (arguments->backup_conn == NULL)`
`2668`	`2668`	`{`
`2669`		`- PGresult *res;`
`2670`		`- char *query;`
`2671`	`2669`
`2672`	`2670`	`arguments->backup_conn = pgut_connect(instance_config.pghost,`
`2673`	`2671`	`instance_config.pgport,`
`@@ -3479,7 +3477,6 @@ get_index_list(PGresult *res_db, int db_number,`
`3479`	`3477`	`{`
`3480`	`3478`	`PGresult *res;`
`3481`	`3479`	`char *nspname = NULL;`
`3482`		`- char *snapshot = NULL;`
`3483`	`3480`	`int i;`
`3484`	`3481`
`3485`	`3482`	`dbname = PQgetvalue(res_db, db_number, 0);`