Merge branch 'master' of git.postgrespro.ru:pgpro-dev/pg_probackup

alubennikova · alubennikova · commit e1d003bb6c93 · 2017-04-19T18:00:09.000+03:00
diff --git a/catalog.c b/catalog.c
@@ -551,11 +551,11 @@ parse_backup_mode(const char *value)
 		v++;
 	len = strlen(v);
 
-	if (len > 0 && pg_strncasecmp("full", v, strlen("full")) == 0)
+	if (len > 0 && pg_strncasecmp("full", v, len) == 0)
 		return BACKUP_MODE_FULL;
-	else if (len > 0 && pg_strncasecmp("page", v, strlen("page")) == 0)
+	else if (len > 0 && pg_strncasecmp("page", v, len) == 0)
 		return BACKUP_MODE_DIFF_PAGE;
-	else if (len > 0 && pg_strncasecmp("ptrack", v, strlen("ptrack")) == 0)
+	else if (len > 0 && pg_strncasecmp("ptrack", v, len) == 0)
 		return BACKUP_MODE_DIFF_PTRACK;
 
 	/* Backup mode is invalid, so leave with an error */
@@ -609,4 +609,4 @@ pgBackupGetPath(const pgBackup *backup, char *path, size_t len, const char *subd
 	free(datetime);
 
 	make_native_path(path);
-}
+}
diff --git a/data.c b/data.c
@@ -78,9 +78,9 @@ backup_data_page(pgFile *file, const XLogRecPtr *prev_backup_start_lsn,
 			/* TODO Should we check specific error code here? */
 			if (verbose)
 				elog(WARNING, "File: %s, could not seek to block %u."
-						  "Probably the file was truncated after backup start.",
-						  file->path, blknum);
-				return;
+					 "Probably the file was truncated after backup start.",
+					 file->path, blknum);
+			return;
 		}
 
 		read_len = fread(&page, 1, BLCKSZ, in);
diff --git a/restore.c b/restore.c
@@ -215,7 +215,7 @@ do_restore_or_validate(time_t target_backup_id,
 	{
 		pgBackup   *backup = (pgBackup *) parray_get(backups, i);
 
-		if (backup->status == BACKUP_STATUS_OK);
+		if (backup->status == BACKUP_STATUS_OK)
 		{
 			pgBackupValidate(backup);
 
diff --git a/show.c b/show.c
@@ -195,7 +195,7 @@ show_backup_list(FILE *out, parray *backup_list)
 		/* Get parent timeline before printing */
 		parent_tli = get_parent_tli(backup->tli);
 
-		fprintf(out, "%-8s %-19s  %s%s %2d / %-2d              %5s  %6s  %2X/%08X  %2X/%08X  %-8s\n",
+		fprintf(out, "%-8s %-19s  %s%-9s %2d / %d               %5s  %6s  %2X/%08X  %2X/%08X  %-8s\n",
 				base36enc(backup->start_time),
 				timestamp,
 				backupModes[backup->backup_mode],

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ do_restore_or_validate(time_t target_backup_id,`
`215`	`215`	`{`
`216`	`216`	`pgBackup backup = (pgBackup ) parray_get(backups, i);`
`217`	`217`
`218`		`- if (backup->status == BACKUP_STATUS_OK);`
	`218`	`+ if (backup->status == BACKUP_STATUS_OK)`
`219`	`219`	`{`
`220`	`220`	`pgBackupValidate(backup);`
`221`	`221`