Commitdf10ac6

committed

Don't use elog() in src/port/pwrite.c.

Nothing broke because of this oversight yet, but it would fail to linkif we tried to use pg_pwrite() in frontend code on a system that lackspwrite(). Use an assertion instead. Also pgindent while here.Discussion:https://postgr.es/m/CA%2BhUKGL57RvoQsS35TVPnQoPYqbtBixsdRhynB8NpcUKpHTTtg%40mail.gmail.com

1 parentee1b38f commitdf10ac6Copy full SHA for df10ac6

File tree

-6

lines changed

-6

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ pg_pwritev(int fd, const struct iovec *iov, int iovcnt, off_t offset)`
`70`	`70`	`return-1;`
`71`	`71`	`returnwritev(fd,iov,iovcnt);`
`72`	`72`	`#else`
`73`		`-ssize_tsum=0;`
`74`		`-ssize_tpart;`
	`73`	`+ssize_tsum=0;`
	`74`	`+ssize_tpart;`
`75`	`75`
`76`	`76`	`for (inti=0;i<iovcnt;++i)`
`77`	`77`	`{`
`@@ -137,14 +137,14 @@ pg_pwritev_with_retry(int fd, const struct iovec *iov, int iovcnt, off_t offset)`
`137`	`137`	`/* Are they all done? */`
`138`	`138`	`if (iovcnt==0)`
`139`	`139`	`{`
`140`		`-if (part>0)`
`141`		`-elog(ERROR,"unexpectedly wrote more than requested");`
	`140`	`+/* We don't expect the kernel to write more than requested. */`
	`141`	`+Assert(part==0);`
`142`	`142`	`break;`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`/*`
`146`		`- * Move whatever's left to the front of our mutable copy and adjust the`
`147`		`- * leading iovec.`
	`146`	`+ * Move whatever's left to the front of our mutable copy and adjust`
	`147`	`+ *theleading iovec.`
`148`	`148`	`*/`
`149`	`149`	`Assert(iovcnt>0);`
`150`	`150`	`memmove(iov_copy,iov,sizeof(iov)iovcnt);`

Comments

(0)