database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-19 13:42:17 +03:00
Code Activity

Improve InitShmemAccess() prototype

Browse Source 
The code comment said, 'the argument should be declared "PGShmemHeader
*seghdr", but we use void to avoid having to include ipc.h in
shmem.h.'  We can achieve the original goal with a struct forward
declaration.  (ipc.h was also not the correct header file.)

Discussion: https://www.postgresql.org/message-id/flat/cnthxg2eekacrejyeonuhiaezc7vd7o2uowlsbenxqfkjwgvwj@qgzu6eoqrglb
This commit is contained in:
Peter Eisentraut
2024-11-26 08:25:23 +01:00
parent e15e567137
commit 2a7b2d9717
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/storage/ipc/shmem.c
View File

@@ -92,18 +92,13 @@ static HTAB *ShmemIndex = NULL; /* primary index hashtable for shmem */
/* /*
* InitShmemAccess() --- set up basic pointers to shared memory. * InitShmemAccess() --- set up basic pointers to shared memory.
*
* Note: the argument should be declared "PGShmemHeader *seghdr",
* but we use void to avoid having to include ipc.h in shmem.h.
*/ */
void void
InitShmemAccess(void *seghdr) InitShmemAccess(PGShmemHeader *seghdr)
{ {
PGShmemHeader *shmhdr = (PGShmemHeader *) seghdr; ShmemSegHdr = seghdr;
ShmemBase = seghdr;
ShmemSegHdr = shmhdr; ShmemEnd = (char *) ShmemBase + seghdr->totalsize;
ShmemBase = (void *) shmhdr;
ShmemEnd = (char *) ShmemBase + shmhdr->totalsize;
} }
/* /*

3
src/include/storage/shmem.h
View File

@@ -27,7 +27,8 @@
/* shmem.c */ /* shmem.c */
extern PGDLLIMPORT slock_t *ShmemLock; extern PGDLLIMPORT slock_t *ShmemLock;
extern void InitShmemAccess(void *seghdr); struct PGShmemHeader; /* avoid including storage/pg_shmem.h here */
extern void InitShmemAccess(struct PGShmemHeader *seghdr);
extern void InitShmemAllocation(void); extern void InitShmemAllocation(void);
extern void *ShmemAlloc(Size size); extern void *ShmemAlloc(Size size);
extern void *ShmemAllocNoError(Size size); extern void *ShmemAllocNoError(Size size);