Commit2a7b2d9

committed

Improve InitShmemAccess() prototype

The code comment said, 'the argument should be declared "PGShmemHeader*seghdr", but we use void to avoid having to include ipc.h inshmem.h.' We can achieve the original goal with a struct forwarddeclaration. (ipc.h was also not the correct header file.)Discussion:https://www.postgresql.org/message-id/flat/cnthxg2eekacrejyeonuhiaezc7vd7o2uowlsbenxqfkjwgvwj@qgzu6eoqrglb

1 parente15e567 commit2a7b2d9Copy full SHA for 2a7b2d9

File tree

-10

lines changed

-10

lines changed

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,18 +92,13 @@ static HTAB ShmemIndex = NULL; / primary index hashtable for shmem */`
`92`	`92`
`93`	`93`	`/*`
`94`	`94`	`*InitShmemAccess() --- set up basic pointers to shared memory.`
`95`		`- *`
`96`		`- * Note: the argument should be declared "PGShmemHeader *seghdr",`
`97`		`- * but we use void to avoid having to include ipc.h in shmem.h.`
`98`	`95`	`*/`
`99`	`96`	`void`
`100`		`-InitShmemAccess(void*seghdr)`
	`97`	`+InitShmemAccess(PGShmemHeader*seghdr)`
`101`	`98`	`{`
`102`		`-PGShmemHeadershmhdr= (PGShmemHeader)seghdr;`
`103`		`-`
`104`		`-ShmemSegHdr=shmhdr;`
`105`		`-ShmemBase= (void*)shmhdr;`
`106`		`-ShmemEnd= (char*)ShmemBase+shmhdr->totalsize;`
	`99`	`+ShmemSegHdr=seghdr;`
	`100`	`+ShmemBase=seghdr;`
	`101`	`+ShmemEnd= (char*)ShmemBase+seghdr->totalsize;`
`107`	`102`	`}`
`108`	`103`
`109`	`104`	`/*`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@`
`27`	`27`
`28`	`28`	`/* shmem.c */`
`29`	`29`	`externPGDLLIMPORTslock_t*ShmemLock;`
`30`		`-externvoidInitShmemAccess(void*seghdr);`
	`30`	`+structPGShmemHeader;/* avoid including storage/pg_shmem.h here */`
	`31`	`+externvoidInitShmemAccess(structPGShmemHeader*seghdr);`
`31`	`32`	`externvoidInitShmemAllocation(void);`
`32`	`33`	`externvoid*ShmemAlloc(Sizesize);`
`33`	`34`	`externvoid*ShmemAllocNoError(Sizesize);`

Comments

(0)