NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4c1a1a3

committed

Ensure that the argument of shmdt(2) is declared "void *".

Our gcc-on-Solaris buildfarm members emit "incompatible pointer type"warnings in places where it's not. This is a bit odd, since AFAICTSolaris follows the POSIX spec in declaring shmdt's argument as"const void *", and you'd think any pointer argument would satisfy that.But whatever. Part of a general push to remove off-the-beaten-trackwarnings where we can easily do so.

1 parent1f6e0ce commit4c1a1a3Copy full SHA for 4c1a1a3

File tree

1 file changed

-3

lines changed

src/backend/port
- sysv_shmem.c

1 file changed

-3

lines changed

`‎src/backend/port/sysv_shmem.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ static void`
`289`	`289`	`IpcMemoryDetach(intstatus,Datumshmaddr)`
`290`	`290`	`{`
`291`	`291`	`/* Detach System V shared memory block. */`
`292`		`-if (shmdt(DatumGetPointer(shmaddr))<0)`
	`292`	`+if (shmdt((void*)DatumGetPointer(shmaddr))<0)`
`293`	`293`	`elog(LOG,"shmdt(%p) failed: %m",DatumGetPointer(shmaddr));`
`294`	`294`	`}`
`295`	`295`
`@@ -323,7 +323,7 @@ PGSharedMemoryIsInUse(unsigned long id1, unsigned long id2)`
`323`	`323`	`IpcMemoryStatestate;`
`324`	`324`
`325`	`325`	`state=PGSharedMemoryAttach((IpcMemoryId)id2,NULL,&memAddress);`
`326`		`-if (memAddress&&shmdt(memAddress)<0)`
	`326`	`+if (memAddress&&shmdt((void*)memAddress)<0)`
`327`	`327`	`elog(LOG,"shmdt(%p) failed: %m",memAddress);`
`328`	`328`	`switch (state)`
`329`	`329`	`{`
`@@ -807,7 +807,7 @@ PGSharedMemoryCreate(Size size,`
`807`	`807`	`break;`
`808`	`808`	`}`
`809`	`809`
`810`		`-if (oldhdr&&shmdt(oldhdr)<0)`
	`810`	`+if (oldhdr&&shmdt((void*)oldhdr)<0)`
`811`	`811`	`elog(LOG,"shmdt(%p) failed: %m",oldhdr);`
`812`	`812`	`}`
`813`	`813`

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!

Commit4c1a1a3

File tree

1 file changed

1 file changed

`‎src/backend/port/sysv_shmem.c`

0 commit comments