NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7f798ac

committed

Remove useless casts to (void *)

Many of them just seem to have been copied around for no real reason.Their presence causes (small) risks of hiding actual type mismatchesor silently discarding qualifiersDiscussion:https://www.postgresql.org/message-id/flat/461ea37c-8b58-43b4-9736-52884e862820@eisentraut.org

1 parent97525bc commit7f798acCopy full SHA for 7f798ac

File tree

158 files changed

+491

-550

lines changed

contrib
- amcheck
  - verify_nbtree.c
- bloom
  - blinsert.c
  - blutils.c
- btree_gist
- file_fdw
  - file_fdw.c
- hstore
  - hstore_op.c
- intarray
  - _int_bool.c
- ltree
  - _ltree_gist.c
  - _ltree_op.c
- pg_trgm
  - trgm_gist.c
- pgcrypto
  - openssl.c
- postgres_fdw
  - postgres_fdw.c
src
- backend
  - access
    - brin
      - brin.c
      - brin_minmax_multi.c
    - common
      - detoast.c
    - gin
      - ginbulk.c
      - gininsert.c
    - gist
      - gist.c
      - gistbuild.c
    - hash
      - hash.c
    - heap
      - vacuumlazy.c
    - nbtree
      - nbtree.c
      - nbtsort.c
    - spgist
      - spginsert.c
      - spgutils.c
    - transam
      - twophase.c
      - xlogrecovery.c
  - catalog
  - commands
  - executor
  - libpq
    - hba.c
  - nodes
  - optimizer
    - geqo
      - geqo_main.c
    - path
      - costsize.c
      - indxpath.c
    - plan
    - prep
      - prepagg.c
      - prepjointree.c
    - util
  - parser
  - partitioning
    - partprune.c
  - port
    - sysv_shmem.c
  - replication
    - logical
      - logical.c
      - tablesync.c
    - slot.c
    - syncrep.c
  - rewrite
  - storage
    - buffer
      - buf_table.c
      - bufmgr.c
    - ipc
      - shmem.c
  - tcop
    - postgres.c
  - tsearch
  - utils
    - adt
    - cache
      - plancache.c
      - typcache.c
    - error
      - elog.c
    - hash
      - dynahash.c
    - mmgr
      - mcxt.c
    - sort
      - tuplesortvariants.c
      - tuplestore.c
- bin
  - pg_dump
  - psql
    - mainloop.c
    - startup.c
- include/common
  - pg_prng.h
- interfaces/ecpg/ecpglib
- pl
  - plpgsql/src
  - plpython
    - plpy_exec.c
- test
  - isolation
    - isolationtester.c
  - modules/test_regex
    - test_regex.c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+491

-550

lines changed

`‎contrib/amcheck/verify_nbtree.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,7 @@ bt_check_every_level(Relation rel, Relation heaprel, bool heapkeyspace,`
`719`	`719`	`RelationGetRelationName(state->heaprel));`
`720`	`720`
`721`	`721`	`table_index_build_scan(state->heaprel,state->rel,indexinfo, true, false,`
`722`		`-bt_tuple_present_callback,(void*)state,scan);`
	`722`	`+bt_tuple_present_callback,state,scan);`
`723`	`723`
`724`	`724`	`ereport(DEBUG1,`
`725`	`725`	`(errmsg_internal("finished verifying presence of "INT64_FORMAT" tuples from table \"%s\" with bitset %.2f%% set",`

`‎contrib/bloom/blinsert.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ blbuild(Relation heap, Relation index, IndexInfo *indexInfo)`
`139`	`139`
`140`	`140`	`/* Do the heap scan */`
`141`	`141`	`reltuples=table_index_build_scan(heap,index,indexInfo, true, true,`
`142`		`-bloomBuildCallback,(void*)&buildstate,`
	`142`	`+bloomBuildCallback,&buildstate,`
`143`	`143`	`NULL);`
`144`	`144`
`145`	`145`	`/* Flush last page if needed (it will be, unless heap was empty) */`

`‎contrib/bloom/blutils.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ initBloomState(BloomState *state, Relation index)`
`199`	`199`
`200`	`200`	`UnlockReleaseBuffer(buffer);`
`201`	`201`
`202`		`-index->rd_amcache=(void*)opts;`
	`202`	`+index->rd_amcache=opts;`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`memcpy(&state->opts,index->rd_amcache,sizeof(state->opts));`

`‎contrib/btree_gist/btree_bit.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ Datum`
`136`	`136`	`gbt_bit_consistent(PG_FUNCTION_ARGS)`
`137`	`137`	`{`
`138`	`138`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`139`		`-voidquery=(void)DatumGetByteaP(PG_GETARG_DATUM(1));`
	`139`	`+void*query=DatumGetByteaP(PG_GETARG_DATUM(1));`
`140`	`140`	`StrategyNumberstrategy= (StrategyNumber)PG_GETARG_UINT16(2);`
`141`	`141`
`142`	`142`	`/* Oidsubtype = PG_GETARG_OID(3); */`

`‎contrib/btree_gist/btree_bool.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ gbt_bool_consistent(PG_FUNCTION_ARGS)`
`120`	`120`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`121`	`121`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`122`	`122`
`123`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`123`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`124`	`124`	`GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`125`	`125`	`}`
`126`	`126`
`@@ -132,7 +132,7 @@ gbt_bool_union(PG_FUNCTION_ARGS)`
`132`	`132`	`void*out=palloc(sizeof(boolKEY));`
`133`	`133`
`134`	`134`	`(int)PG_GETARG_POINTER(1)=sizeof(boolKEY);`
`135`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`135`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`136`	`136`	`}`
`137`	`137`
`138`	`138`

`‎contrib/btree_gist/btree_bytea.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ Datum`
`104`	`104`	`gbt_bytea_consistent(PG_FUNCTION_ARGS)`
`105`	`105`	`{`
`106`	`106`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`107`		`-voidquery=(void)DatumGetByteaP(PG_GETARG_DATUM(1));`
	`107`	`+void*query=DatumGetByteaP(PG_GETARG_DATUM(1));`
`108`	`108`	`StrategyNumberstrategy= (StrategyNumber)PG_GETARG_UINT16(2);`
`109`	`109`
`110`	`110`	`/* Oidsubtype = PG_GETARG_OID(3); */`

`‎contrib/btree_gist/btree_cash.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ gbt_cash_consistent(PG_FUNCTION_ARGS)`
`150`	`150`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`151`	`151`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`152`	`152`
`153`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`153`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`154`	`154`	`GIST_LEAF(entry),&tinfo,`
`155`	`155`	`fcinfo->flinfo));`
`156`	`156`	`}`
`@@ -169,7 +169,7 @@ gbt_cash_distance(PG_FUNCTION_ARGS)`
`169`	`169`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`170`	`170`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`171`	`171`
`172`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)&query,GIST_LEAF(entry),`
	`172`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,&query,GIST_LEAF(entry),`
`173`	`173`	`&tinfo,fcinfo->flinfo));`
`174`	`174`	`}`
`175`	`175`
`@@ -181,7 +181,7 @@ gbt_cash_union(PG_FUNCTION_ARGS)`
`181`	`181`	`void*out=palloc(sizeof(cashKEY));`
`182`	`182`
`183`	`183`	`(int)PG_GETARG_POINTER(1)=sizeof(cashKEY);`
`184`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`184`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`185`	`185`	`}`
`186`	`186`
`187`	`187`

`‎contrib/btree_gist/btree_date.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ gbt_date_consistent(PG_FUNCTION_ARGS)`
`167`	`167`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`168`	`168`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`169`	`169`
`170`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`170`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`171`	`171`	`GIST_LEAF(entry),&tinfo,`
`172`	`172`	`fcinfo->flinfo));`
`173`	`173`	`}`
`@@ -186,7 +186,7 @@ gbt_date_distance(PG_FUNCTION_ARGS)`
`186`	`186`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`187`	`187`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`188`	`188`
`189`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)&query,GIST_LEAF(entry),`
	`189`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,&query,GIST_LEAF(entry),`
`190`	`190`	`&tinfo,fcinfo->flinfo));`
`191`	`191`	`}`
`192`	`192`
`@@ -198,7 +198,7 @@ gbt_date_union(PG_FUNCTION_ARGS)`
`198`	`198`	`void*out=palloc(sizeof(dateKEY));`
`199`	`199`
`200`	`200`	`(int)PG_GETARG_POINTER(1)=sizeof(dateKEY);`
`201`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`201`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`202`	`202`	`}`
`203`	`203`
`204`	`204`

`‎contrib/btree_gist/btree_enum.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ gbt_enum_consistent(PG_FUNCTION_ARGS)`
`137`	`137`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`138`	`138`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`139`	`139`
`140`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`140`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`141`	`141`	`GIST_LEAF(entry),&tinfo,`
`142`	`142`	`fcinfo->flinfo));`
`143`	`143`	`}`
`@@ -149,7 +149,7 @@ gbt_enum_union(PG_FUNCTION_ARGS)`
`149`	`149`	`void*out=palloc(sizeof(oidKEY));`
`150`	`150`
`151`	`151`	`(int)PG_GETARG_POINTER(1)=sizeof(oidKEY);`
`152`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`152`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`153`	`153`	`}`
`154`	`154`
`155`	`155`

`‎contrib/btree_gist/btree_float4.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ gbt_float4_consistent(PG_FUNCTION_ARGS)`
`145`	`145`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`146`	`146`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`147`	`147`
`148`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`148`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`149`	`149`	`GIST_LEAF(entry),&tinfo,`
`150`	`150`	`fcinfo->flinfo));`
`151`	`151`	`}`
`@@ -164,7 +164,7 @@ gbt_float4_distance(PG_FUNCTION_ARGS)`
`164`	`164`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`165`	`165`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`166`	`166`
`167`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)&query,GIST_LEAF(entry),`
	`167`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,&query,GIST_LEAF(entry),`
`168`	`168`	`&tinfo,fcinfo->flinfo));`
`169`	`169`	`}`
`170`	`170`
`@@ -176,7 +176,7 @@ gbt_float4_union(PG_FUNCTION_ARGS)`
`176`	`176`	`void*out=palloc(sizeof(float4KEY));`
`177`	`177`
`178`	`178`	`(int)PG_GETARG_POINTER(1)=sizeof(float4KEY);`
`179`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`179`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`180`	`180`	`}`
`181`	`181`
`182`	`182`

`‎contrib/btree_gist/btree_float8.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ gbt_float8_consistent(PG_FUNCTION_ARGS)`
`152`	`152`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`153`	`153`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`154`	`154`
`155`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`155`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`156`	`156`	`GIST_LEAF(entry),&tinfo,`
`157`	`157`	`fcinfo->flinfo));`
`158`	`158`	`}`
`@@ -171,7 +171,7 @@ gbt_float8_distance(PG_FUNCTION_ARGS)`
`171`	`171`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`172`	`172`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`173`	`173`
`174`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)&query,GIST_LEAF(entry),`
	`174`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,&query,GIST_LEAF(entry),`
`175`	`175`	`&tinfo,fcinfo->flinfo));`
`176`	`176`	`}`
`177`	`177`
`@@ -183,7 +183,7 @@ gbt_float8_union(PG_FUNCTION_ARGS)`
`183`	`183`	`void*out=palloc(sizeof(float8KEY));`
`184`	`184`
`185`	`185`	`(int)PG_GETARG_POINTER(1)=sizeof(float8KEY);`
`186`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`186`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`187`	`187`	`}`
`188`	`188`
`189`	`189`

`‎contrib/btree_gist/btree_inet.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ gbt_inet_consistent(PG_FUNCTION_ARGS)`
`138`	`138`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`139`	`139`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`140`	`140`
`141`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,`
	`141`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,`
`142`	`142`	`&strategy,GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`143`	`143`	`}`
`144`	`144`
`@@ -150,7 +150,7 @@ gbt_inet_union(PG_FUNCTION_ARGS)`
`150`	`150`	`void*out=palloc(sizeof(inetKEY));`
`151`	`151`
`152`	`152`	`(int)PG_GETARG_POINTER(1)=sizeof(inetKEY);`
`153`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`153`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`154`	`154`	`}`
`155`	`155`
`156`	`156`

`‎contrib/btree_gist/btree_int2.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ gbt_int2_consistent(PG_FUNCTION_ARGS)`
`150`	`150`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`151`	`151`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`152`	`152`
`153`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`153`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`154`	`154`	`GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`155`	`155`	`}`
`156`	`156`
`@@ -168,7 +168,7 @@ gbt_int2_distance(PG_FUNCTION_ARGS)`
`168`	`168`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`169`	`169`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`170`	`170`
`171`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)&query,GIST_LEAF(entry),`
	`171`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,&query,GIST_LEAF(entry),`
`172`	`172`	`&tinfo,fcinfo->flinfo));`
`173`	`173`	`}`
`174`	`174`
`@@ -180,7 +180,7 @@ gbt_int2_union(PG_FUNCTION_ARGS)`
`180`	`180`	`void*out=palloc(sizeof(int16KEY));`
`181`	`181`
`182`	`182`	`(int)PG_GETARG_POINTER(1)=sizeof(int16KEY);`
`183`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`183`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`184`	`184`	`}`
`185`	`185`
`186`	`186`

`‎contrib/btree_gist/btree_int4.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ gbt_int4_consistent(PG_FUNCTION_ARGS)`
`151`	`151`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`152`	`152`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`153`	`153`
`154`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`154`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`155`	`155`	`GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`156`	`156`	`}`
`157`	`157`
`@@ -169,7 +169,7 @@ gbt_int4_distance(PG_FUNCTION_ARGS)`
`169`	`169`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`170`	`170`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`171`	`171`
`172`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)&query,GIST_LEAF(entry),`
	`172`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,&query,GIST_LEAF(entry),`
`173`	`173`	`&tinfo,fcinfo->flinfo));`
`174`	`174`	`}`
`175`	`175`
`@@ -181,7 +181,7 @@ gbt_int4_union(PG_FUNCTION_ARGS)`
`181`	`181`	`void*out=palloc(sizeof(int32KEY));`
`182`	`182`
`183`	`183`	`(int)PG_GETARG_POINTER(1)=sizeof(int32KEY);`
`184`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`184`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`185`	`185`	`}`
`186`	`186`
`187`	`187`

`‎contrib/btree_gist/btree_int8.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ gbt_int8_consistent(PG_FUNCTION_ARGS)`
`151`	`151`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`152`	`152`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`153`	`153`
`154`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`154`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`155`	`155`	`GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`156`	`156`	`}`
`157`	`157`
`@@ -169,7 +169,7 @@ gbt_int8_distance(PG_FUNCTION_ARGS)`
`169`	`169`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`170`	`170`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`171`	`171`
`172`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)&query,GIST_LEAF(entry),`
	`172`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,&query,GIST_LEAF(entry),`
`173`	`173`	`&tinfo,fcinfo->flinfo));`
`174`	`174`	`}`
`175`	`175`
`@@ -181,7 +181,7 @@ gbt_int8_union(PG_FUNCTION_ARGS)`
`181`	`181`	`void*out=palloc(sizeof(int64KEY));`
`182`	`182`
`183`	`183`	`(int)PG_GETARG_POINTER(1)=sizeof(int64KEY);`
`184`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`184`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`185`	`185`	`}`
`186`	`186`
`187`	`187`

`‎contrib/btree_gist/btree_interval.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ gbt_intv_consistent(PG_FUNCTION_ARGS)`
`224`	`224`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`225`	`225`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`226`	`226`
`227`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)query,&strategy,`
	`227`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,query,&strategy,`
`228`	`228`	`GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`229`	`229`	`}`
`230`	`230`
`@@ -242,7 +242,7 @@ gbt_intv_distance(PG_FUNCTION_ARGS)`
`242`	`242`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`243`	`243`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`244`	`244`
`245`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)query,GIST_LEAF(entry),`
	`245`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,query,GIST_LEAF(entry),`
`246`	`246`	`&tinfo,fcinfo->flinfo));`
`247`	`247`	`}`
`248`	`248`
`@@ -254,7 +254,7 @@ gbt_intv_union(PG_FUNCTION_ARGS)`
`254`	`254`	`void*out=palloc(sizeof(intvKEY));`
`255`	`255`
`256`	`256`	`(int)PG_GETARG_POINTER(1)=sizeof(intvKEY);`
`257`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`257`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`258`	`258`	`}`
`259`	`259`
`260`	`260`

`‎contrib/btree_gist/btree_macaddr.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ gbt_macad_consistent(PG_FUNCTION_ARGS)`
`141`	`141`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`142`	`142`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`143`	`143`
`144`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)query,&strategy,`
	`144`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,query,&strategy,`
`145`	`145`	`GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`146`	`146`	`}`
`147`	`147`
`@@ -153,7 +153,7 @@ gbt_macad_union(PG_FUNCTION_ARGS)`
`153`	`153`	`void*out=palloc0(sizeof(macKEY));`
`154`	`154`
`155`	`155`	`(int)PG_GETARG_POINTER(1)=sizeof(macKEY);`
`156`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`156`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`157`	`157`	`}`
`158`	`158`
`159`	`159`

`‎contrib/btree_gist/btree_macaddr8.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ gbt_macad8_consistent(PG_FUNCTION_ARGS)`
`141`	`141`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`142`	`142`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`143`	`143`
`144`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)query,&strategy,`
	`144`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,query,&strategy,`
`145`	`145`	`GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`146`	`146`	`}`
`147`	`147`
`@@ -153,7 +153,7 @@ gbt_macad8_union(PG_FUNCTION_ARGS)`
`153`	`153`	`void*out=palloc0(sizeof(mac8KEY));`
`154`	`154`
`155`	`155`	`(int)PG_GETARG_POINTER(1)=sizeof(mac8KEY);`
`156`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`156`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`157`	`157`	`}`
`158`	`158`
`159`	`159`

`‎contrib/btree_gist/btree_numeric.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ Datum`
`108`	`108`	`gbt_numeric_consistent(PG_FUNCTION_ARGS)`
`109`	`109`	`{`
`110`	`110`	`GISTENTRYentry= (GISTENTRY)PG_GETARG_POINTER(0);`
`111`		`-voidquery=(void)DatumGetNumeric(PG_GETARG_DATUM(1));`
	`111`	`+void*query=DatumGetNumeric(PG_GETARG_DATUM(1));`
`112`	`112`	`StrategyNumberstrategy= (StrategyNumber)PG_GETARG_UINT16(2);`
`113`	`113`
`114`	`114`	`/* Oidsubtype = PG_GETARG_OID(3); */`

`‎contrib/btree_gist/btree_oid.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ gbt_oid_consistent(PG_FUNCTION_ARGS)`
`151`	`151`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`152`	`152`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`153`	`153`
`154`		`-PG_RETURN_BOOL(gbt_num_consistent(&key,(void*)&query,&strategy,`
	`154`	`+PG_RETURN_BOOL(gbt_num_consistent(&key,&query,&strategy,`
`155`	`155`	`GIST_LEAF(entry),&tinfo,fcinfo->flinfo));`
`156`	`156`	`}`
`157`	`157`
`@@ -169,7 +169,7 @@ gbt_oid_distance(PG_FUNCTION_ARGS)`
`169`	`169`	`key.lower= (GBT_NUMKEY*)&kkk->lower;`
`170`	`170`	`key.upper= (GBT_NUMKEY*)&kkk->upper;`
`171`	`171`
`172`		`-PG_RETURN_FLOAT8(gbt_num_distance(&key,(void*)&query,GIST_LEAF(entry),`
	`172`	`+PG_RETURN_FLOAT8(gbt_num_distance(&key,&query,GIST_LEAF(entry),`
`173`	`173`	`&tinfo,fcinfo->flinfo));`
`174`	`174`	`}`
`175`	`175`
`@@ -181,7 +181,7 @@ gbt_oid_union(PG_FUNCTION_ARGS)`
`181`	`181`	`void*out=palloc(sizeof(oidKEY));`
`182`	`182`
`183`	`183`	`(int)PG_GETARG_POINTER(1)=sizeof(oidKEY);`
`184`		`-PG_RETURN_POINTER(gbt_num_union((void*)out,entryvec,&tinfo,fcinfo->flinfo));`
	`184`	`+PG_RETURN_POINTER(gbt_num_union(out,entryvec,&tinfo,fcinfo->flinfo));`
`185`	`185`	`}`
`186`	`186`
`187`	`187`

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!

Commit7f798ac

File tree

158 files changed

Some content is hidden

158 files changed

`‎contrib/amcheck/verify_nbtree.c`

`‎contrib/bloom/blinsert.c`

`‎contrib/bloom/blutils.c`

`‎contrib/btree_gist/btree_bit.c`

`‎contrib/btree_gist/btree_bool.c`

`‎contrib/btree_gist/btree_bytea.c`

`‎contrib/btree_gist/btree_cash.c`

`‎contrib/btree_gist/btree_date.c`

`‎contrib/btree_gist/btree_enum.c`

`‎contrib/btree_gist/btree_float4.c`

`‎contrib/btree_gist/btree_float8.c`

`‎contrib/btree_gist/btree_inet.c`

`‎contrib/btree_gist/btree_int2.c`

`‎contrib/btree_gist/btree_int4.c`

`‎contrib/btree_gist/btree_int8.c`

`‎contrib/btree_gist/btree_interval.c`

`‎contrib/btree_gist/btree_macaddr.c`

`‎contrib/btree_gist/btree_macaddr8.c`

`‎contrib/btree_gist/btree_numeric.c`

`‎contrib/btree_gist/btree_oid.c`

0 commit comments