NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitcd6c45c

committed

Suppress maybe-uninitialized compiler warnings.

Previously some compilers were thinking that the variables that57aa5b2 added maybe-uninitialized.Spotted by Andres Freund

1 parent5ff6839 commitcd6c45cCopy full SHA for cd6c45c

File tree

1 file changed

+18

-21

lines changed

src/backend/access/transam
- xloginsert.c

1 file changed

+18

-21

lines changed

`‎src/backend/access/transam/xloginsert.c‎`

Lines changed: 18 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -491,11 +491,9 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,`
`491`	`491`	`boolneeds_data;`
`492`	`492`	`XLogRecordBlockHeaderbkpb;`
`493`	`493`	`XLogRecordBlockImageHeaderbimg;`
`494`		`-XLogRecordBlockCompressHeadercbimg;`
	`494`	`+XLogRecordBlockCompressHeadercbimg= {0};`
`495`	`495`	`boolsamerel;`
`496`	`496`	`boolis_compressed= false;`
`497`		`-uint16hole_length;`
`498`		`-uint16hole_offset;`
`499`	`497`
`500`	`498`	`if (!regbuf->in_use)`
`501`	`499`	`continue;`
`@@ -558,21 +556,21 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,`
`558`	`556`	`upper>lower&&`
`559`	`557`	`upper <=BLCKSZ)`
`560`	`558`	`{`
`561`		`-hole_offset=lower;`
`562`		`-hole_length=upper-lower;`
	`559`	`+bimg.hole_offset=lower;`
	`560`	`+cbimg.hole_length=upper-lower;`
`563`	`561`	`}`
`564`	`562`	`else`
`565`	`563`	`{`
`566`	`564`	`/* No "hole" to compress out */`
`567`		`-hole_offset=0;`
`568`		`-hole_length=0;`
	`565`	`+bimg.hole_offset=0;`
	`566`	`+cbimg.hole_length=0;`
`569`	`567`	`}`
`570`	`568`	`}`
`571`	`569`	`else`
`572`	`570`	`{`
`573`	`571`	`/* Not a standard page header, don't try to eliminate "hole" */`
`574`		`-hole_offset=0;`
`575`		`-hole_length=0;`
	`572`	`+bimg.hole_offset=0;`
	`573`	`+cbimg.hole_length=0;`
`576`	`574`	`}`
`577`	`575`
`578`	`576`	`/*`
`@@ -581,7 +579,8 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,`
`581`	`579`	`if (wal_compression)`
`582`	`580`	`{`
`583`	`581`	`is_compressed=`
`584`		`-XLogCompressBackupBlock(page,hole_offset,hole_length,`
	`582`	`+XLogCompressBackupBlock(page,bimg.hole_offset,`
	`583`	`+cbimg.hole_length,`
`585`	`584`	`regbuf->compressed_page,`
`586`	`585`	`&compressed_len);`
`587`	`586`	`}`
`@@ -595,25 +594,21 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,`
`595`	`594`	`rdt_datas_last->next=&regbuf->bkp_rdatas[0];`
`596`	`595`	`rdt_datas_last=rdt_datas_last->next;`
`597`	`596`
`598`		`-bimg.bimg_info= (hole_length==0) ?0 :BKPIMAGE_HAS_HOLE;`
	`597`	`+bimg.bimg_info= (cbimg.hole_length==0) ?0 :BKPIMAGE_HAS_HOLE;`
`599`	`598`
`600`	`599`	`if (is_compressed)`
`601`	`600`	`{`
`602`	`601`	`bimg.length=compressed_len;`
`603`		`-bimg.hole_offset=hole_offset;`
`604`	`602`	`bimg.bimg_info \|=BKPIMAGE_IS_COMPRESSED;`
`605`		`-if (hole_length!=0)`
`606`		`-cbimg.hole_length=hole_length;`
`607`	`603`
`608`	`604`	`rdt_datas_last->data=regbuf->compressed_page;`
`609`	`605`	`rdt_datas_last->len=compressed_len;`
`610`	`606`	`}`
`611`	`607`	`else`
`612`	`608`	`{`
`613`		`-bimg.length=BLCKSZ-hole_length;`
`614`		`-bimg.hole_offset=hole_offset;`
	`609`	`+bimg.length=BLCKSZ-cbimg.hole_length;`
`615`	`610`
`616`		`-if (hole_length==0)`
	`611`	`+if (cbimg.hole_length==0)`
`617`	`612`	`{`
`618`	`613`	`rdt_datas_last->data=page;`
`619`	`614`	`rdt_datas_last->len=BLCKSZ;`
`@@ -622,13 +617,15 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,`
`622`	`617`	`{`
`623`	`618`	`/* must skip the hole */`
`624`	`619`	`rdt_datas_last->data=page;`
`625`		`-rdt_datas_last->len=hole_offset;`
	`620`	`+rdt_datas_last->len=bimg.hole_offset;`
`626`	`621`
`627`	`622`	`rdt_datas_last->next=&regbuf->bkp_rdatas[1];`
`628`	`623`	`rdt_datas_last=rdt_datas_last->next;`
`629`	`624`
`630`		`-rdt_datas_last->data=page+ (hole_offset+hole_length);`
`631`		`-rdt_datas_last->len=BLCKSZ- (hole_offset+hole_length);`
	`625`	`+rdt_datas_last->data=`
	`626`	`+page+ (bimg.hole_offset+cbimg.hole_length);`
	`627`	`+rdt_datas_last->len=`
	`628`	`+BLCKSZ- (bimg.hole_offset+cbimg.hole_length);`
`632`	`629`	`}`
`633`	`630`	`}`
`634`	`631`
`@@ -665,7 +662,7 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,`
`665`	`662`	`{`
`666`	`663`	`memcpy(scratch,&bimg,SizeOfXLogRecordBlockImageHeader);`
`667`	`664`	`scratch+=SizeOfXLogRecordBlockImageHeader;`
`668`		`-if (hole_length!=0&&is_compressed)`
	`665`	`+if (cbimg.hole_length!=0&&is_compressed)`
`669`	`666`	`{`
`670`	`667`	`memcpy(scratch,&cbimg,`
`671`	`668`	`SizeOfXLogRecordBlockCompressHeader);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcd6c45c

File tree

1 file changed

1 file changed

`‎src/backend/access/transam/xloginsert.c‎`

0 commit comments