Commitd389487

committed

Small refactor to get rid of -Wshadow=compatible-local warning

Further reduce -Wshadow=compatible-local warnings by 1 by refactoring thecode in gistRelocateBuildBuffersOnSplit() to make use offoreach_current_index() instead of manually incrementing a variable oneach loop.Author: David RowleyDiscussion:https://postgr.es/m/CAApHDvpGZX-X=Bn4moyXgfFa0CdSUwoa04d3isit3=1qo8F8Bw@mail.gmail.com

1 parent3e0fff2 commitd389487Copy full SHA for d389487

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -543,8 +543,7 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers gfbb, GISTSTATE giststate,`
`543`	`543`	`GISTNodeBuffer*nodeBuffer;`
`544`	`544`	`BlockNumberblocknum;`
`545`	`545`	`IndexTupleitup;`
`546`		`-intsplitPagesCount=0,`
`547`		`-i;`
	`546`	`+intsplitPagesCount=0;`
`548`	`547`	`GISTENTRYentry[INDEX_MAX_KEYS];`
`549`	`548`	`boolisnull[INDEX_MAX_KEYS];`
`550`	`549`	`GISTNodeBufferoldBuf;`
`@@ -595,11 +594,11 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers gfbb, GISTSTATE giststate,`
`595`	`594`	`* Fill relocation buffers information for node buffers of pages produced`
`596`	`595`	`* by split.`
`597`	`596`	`*/`
`598`		`-i=0;`
`599`	`597`	`foreach(lc,splitinfo)`
`600`	`598`	`{`
`601`	`599`	`GISTPageSplitInfosi= (GISTPageSplitInfo)lfirst(lc);`
`602`	`600`	`GISTNodeBuffer*newNodeBuffer;`
	`601`	`+inti=foreach_current_index(lc);`
`603`	`602`
`604`	`603`	`/* Decompress parent index tuple of node buffer page. */`
`605`	`604`	`gistDeCompressAtt(giststate,r,`
`@@ -618,8 +617,6 @@ gistRelocateBuildBuffersOnSplit(GISTBuildBuffers gfbb, GISTSTATE giststate,`
`618`	`617`
`619`	`618`	`relocationBuffersInfos[i].nodeBuffer=newNodeBuffer;`
`620`	`619`	`relocationBuffersInfos[i].splitinfo=si;`
`621`		`-`
`622`		`-i++;`
`623`	`620`	`}`
`624`	`621`
`625`	`622`	`/*`

Comments

(0)