NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb5b3229

committed

Avoid -Wconversion warnings from direct use of GET_n_BYTES macros.

The GET/SET_n_BYTES macros are meant to be infrastructure for theDatumGetFoo/FooGetDatum macros, which include a cast to the intendedtarget type. Using them directly without a cast, as DatumGetFloat4and friends previously did, can yield warnings when -Wconversion is on.This is of little significance when building Postgres proper, becausethere are such a huge number of such warnings in the server that nobodywould think -Wconversion is of any use. But some extensions build with-Wconversion due to outside constraints. Commit14cca1b did a disserviceto those extensions by moving DatumGetFloat4 et al into postgres.h,where they can now cause warnings in extension builds.To fix, use DatumGetInt32 and friends in place of the low-level macros.This is arguably a bit cleaner anyway.Chapman FlackDiscussion:https://postgr.es/m/592E4D04.1070609@anastigmatix.net

1 parent54e839f commitb5b3229Copy full SHA for b5b3229

File tree

1 file changed

-4

lines changed

src/include
- postgres.h

1 file changed

-4

lines changed

`‎src/include/postgres.h`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ DatumGetFloat4(Datum X)`
`679`	`679`	`float4retval;`
`680`	`680`	`}myunion;`
`681`	`681`
`682`		`-myunion.value=GET_4_BYTES(X);`
	`682`	`+myunion.value=DatumGetInt32(X);`
`683`	`683`	`returnmyunion.retval;`
`684`	`684`	`}`
`685`	`685`	`#else`
`@@ -704,7 +704,7 @@ Float4GetDatum(float4 X)`
`704`	`704`	`}myunion;`
`705`	`705`
`706`	`706`	`myunion.value=X;`
`707`		`-returnSET_4_BYTES(myunion.retval);`
	`707`	`+returnInt32GetDatum(myunion.retval);`
`708`	`708`	`}`
`709`	`709`	`#else`
`710`	`710`	`externDatumFloat4GetDatum(float4X);`
`@@ -727,7 +727,7 @@ DatumGetFloat8(Datum X)`
`727`	`727`	`float8retval;`
`728`	`728`	`}myunion;`
`729`	`729`
`730`		`-myunion.value=GET_8_BYTES(X);`
	`730`	`+myunion.value=DatumGetInt64(X);`
`731`	`731`	`returnmyunion.retval;`
`732`	`732`	`}`
`733`	`733`	`#else`
`@@ -753,7 +753,7 @@ Float8GetDatum(float8 X)`
`753`	`753`	`}myunion;`
`754`	`754`
`755`	`755`	`myunion.value=X;`
`756`		`-returnSET_8_BYTES(myunion.retval);`
	`756`	`+returnInt64GetDatum(myunion.retval);`
`757`	`757`	`}`
`758`	`758`	`#else`
`759`	`759`	`externDatumFloat8GetDatum(float8X);`

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!

Commitb5b3229

File tree

1 file changed

1 file changed

`‎src/include/postgres.h`

0 commit comments