Commitffa63a2

committed

Merge branch 'master' into issue_92

2 parentsc069399 +79f940f commitffa63a2Copy full SHA for ffa63a2

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ backup_data_file(backup_files_arg* arguments,`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`if (file->size %BLCKSZ!=0)`
`588`		`-elog(WARNING,"File:%s, invalid file size %zu",file->path,file->size);`
	`588`	`+elog(WARNING,"File:\"%s\", invalid file size %zu",file->path,file->size);`
`589`	`589`
`590`	`590`	`/*`
`591`	`591`	`* Compute expected number of blocks in the file.`
`@@ -622,7 +622,7 @@ backup_data_file(backup_files_arg* arguments,`
`622`	`622`	`if (rc==PAGE_CHECKSUM_MISMATCH&&is_ptrack_support)`
`623`	`623`	`gotoRetryUsingPtrack;`
`624`	`624`	`if (rc<0)`
`625`		`-elog(ERROR,"Failed to read file%s: %s",`
	`625`	`+elog(ERROR,"Failed to read file\"%s\": %s",`
`626`	`626`	`file->path,rc==PAGE_CHECKSUM_MISMATCH ?"data file checksum mismatch" :strerror(-rc));`
`627`	`627`	`n_blocks_read=rc;`
`628`	`628`	`}`
`@@ -1209,10 +1209,7 @@ check_data_file(ConnectionArgs *arguments,`
`1209`	`1209`	`}`
`1210`	`1210`
`1211`	`1211`	`if (file->size %BLCKSZ!=0)`
`1212`		`-{`
`1213`		`-fclose(in);`
`1214`		`-elog(WARNING,"File: %s, invalid file size %zu",file->path,file->size);`
`1215`		`-}`
	`1212`	`+elog(WARNING,"File: \"%s\", invalid file size %zu",file->path,file->size);`
`1216`	`1213`
`1217`	`1214`	`/*`
`1218`	`1215`	`* Compute expected number of blocks in the file.`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1150,8 +1150,7 @@ int fio_send_pages(FILE* in, FILE* out, pgFile *file,`
`1150`	`1150`
`1151`	`1151`	`if ((int)hdr.arg<0)/* read error */`
`1152`	`1152`	`{`
`1153`		`-errno=-(int)hdr.arg;`
`1154`		`-return-1;`
	`1153`	`+return (int)hdr.arg;`
`1155`	`1154`	`}`
`1156`	`1155`
`1157`	`1156`	`blknum=hdr.arg;`

Comments

(0)