Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1b81c2f

Browse files
committed
Remove many -Wcast-qual warnings
This addresses only those cases that are easy to fix by adding ormoving a const qualifier or removing an unnecessary cast. There aremany more complicated cases remaining.
1 parent02bca4f commit1b81c2f

File tree

55 files changed

+219
-218
lines changed

Some content is hidden

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

55 files changed

+219
-218
lines changed

‎contrib/btree_gist/btree_cash.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,34 @@ Datumgbt_cash_same(PG_FUNCTION_ARGS);
3535
staticbool
3636
gbt_cashgt(constvoid*a,constvoid*b)
3737
{
38-
return (*((Cash*)a)>*((Cash*)b));
38+
return (*((constCash*)a)>*((constCash*)b));
3939
}
4040
staticbool
4141
gbt_cashge(constvoid*a,constvoid*b)
4242
{
43-
return (*((Cash*)a) >=*((Cash*)b));
43+
return (*((constCash*)a) >=*((constCash*)b));
4444
}
4545
staticbool
4646
gbt_casheq(constvoid*a,constvoid*b)
4747
{
48-
return (*((Cash*)a)==*((Cash*)b));
48+
return (*((constCash*)a)==*((constCash*)b));
4949
}
5050
staticbool
5151
gbt_cashle(constvoid*a,constvoid*b)
5252
{
53-
return (*((Cash*)a) <=*((Cash*)b));
53+
return (*((constCash*)a) <=*((constCash*)b));
5454
}
5555
staticbool
5656
gbt_cashlt(constvoid*a,constvoid*b)
5757
{
58-
return (*((Cash*)a)<*((Cash*)b));
58+
return (*((constCash*)a)<*((constCash*)b));
5959
}
6060

6161
staticint
6262
gbt_cashkey_cmp(constvoid*a,constvoid*b)
6363
{
64-
cashKEY*ia= (cashKEY*) (((Nsrt*)a)->t);
65-
cashKEY*ib= (cashKEY*) (((Nsrt*)b)->t);
64+
cashKEY*ia= (cashKEY*) (((constNsrt*)a)->t);
65+
cashKEY*ib= (cashKEY*) (((constNsrt*)b)->t);
6666

6767
if (ia->lower==ib->lower)
6868
{

‎contrib/btree_gist/btree_date.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,39 @@ static bool
3636
gbt_dategt(constvoid*a,constvoid*b)
3737
{
3838
returnDatumGetBool(
39-
DirectFunctionCall2(date_gt,DateADTGetDatum(*((DateADT*)a)),DateADTGetDatum(*((DateADT*)b)))
39+
DirectFunctionCall2(date_gt,DateADTGetDatum(*((constDateADT*)a)),DateADTGetDatum(*((constDateADT*)b)))
4040
);
4141
}
4242

4343
staticbool
4444
gbt_datege(constvoid*a,constvoid*b)
4545
{
4646
returnDatumGetBool(
47-
DirectFunctionCall2(date_ge,DateADTGetDatum(*((DateADT*)a)),DateADTGetDatum(*((DateADT*)b)))
47+
DirectFunctionCall2(date_ge,DateADTGetDatum(*((constDateADT*)a)),DateADTGetDatum(*((constDateADT*)b)))
4848
);
4949
}
5050

5151
staticbool
5252
gbt_dateeq(constvoid*a,constvoid*b)
5353
{
5454
returnDatumGetBool(
55-
DirectFunctionCall2(date_eq,DateADTGetDatum(*((DateADT*)a)),DateADTGetDatum(*((DateADT*)b)))
55+
DirectFunctionCall2(date_eq,DateADTGetDatum(*((constDateADT*)a)),DateADTGetDatum(*((constDateADT*)b)))
5656
);
5757
}
5858

5959
staticbool
6060
gbt_datele(constvoid*a,constvoid*b)
6161
{
6262
returnDatumGetBool(
63-
DirectFunctionCall2(date_le,DateADTGetDatum(*((DateADT*)a)),DateADTGetDatum(*((DateADT*)b)))
63+
DirectFunctionCall2(date_le,DateADTGetDatum(*((constDateADT*)a)),DateADTGetDatum(*((constDateADT*)b)))
6464
);
6565
}
6666

6767
staticbool
6868
gbt_datelt(constvoid*a,constvoid*b)
6969
{
7070
returnDatumGetBool(
71-
DirectFunctionCall2(date_lt,DateADTGetDatum(*((DateADT*)a)),DateADTGetDatum(*((DateADT*)b)))
71+
DirectFunctionCall2(date_lt,DateADTGetDatum(*((constDateADT*)a)),DateADTGetDatum(*((constDateADT*)b)))
7272
);
7373
}
7474

@@ -77,8 +77,8 @@ gbt_datelt(const void *a, const void *b)
7777
staticint
7878
gbt_datekey_cmp(constvoid*a,constvoid*b)
7979
{
80-
dateKEY*ia= (dateKEY*) (((Nsrt*)a)->t);
81-
dateKEY*ib= (dateKEY*) (((Nsrt*)b)->t);
80+
dateKEY*ia= (dateKEY*) (((constNsrt*)a)->t);
81+
dateKEY*ib= (dateKEY*) (((constNsrt*)b)->t);
8282
intres;
8383

8484
res=DatumGetInt32(DirectFunctionCall2(date_cmp,DateADTGetDatum(ia->lower),DateADTGetDatum(ib->lower)));

‎contrib/btree_gist/btree_float4.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,34 @@ Datumgbt_float4_same(PG_FUNCTION_ARGS);
3434
staticbool
3535
gbt_float4gt(constvoid*a,constvoid*b)
3636
{
37-
return (*((float4*)a)>*((float4*)b));
37+
return (*((constfloat4*)a)>*((constfloat4*)b));
3838
}
3939
staticbool
4040
gbt_float4ge(constvoid*a,constvoid*b)
4141
{
42-
return (*((float4*)a) >=*((float4*)b));
42+
return (*((constfloat4*)a) >=*((constfloat4*)b));
4343
}
4444
staticbool
4545
gbt_float4eq(constvoid*a,constvoid*b)
4646
{
47-
return (*((float4*)a)==*((float4*)b));
47+
return (*((constfloat4*)a)==*((constfloat4*)b));
4848
}
4949
staticbool
5050
gbt_float4le(constvoid*a,constvoid*b)
5151
{
52-
return (*((float4*)a) <=*((float4*)b));
52+
return (*((constfloat4*)a) <=*((constfloat4*)b));
5353
}
5454
staticbool
5555
gbt_float4lt(constvoid*a,constvoid*b)
5656
{
57-
return (*((float4*)a)<*((float4*)b));
57+
return (*((constfloat4*)a)<*((constfloat4*)b));
5858
}
5959

6060
staticint
6161
gbt_float4key_cmp(constvoid*a,constvoid*b)
6262
{
63-
float4KEY*ia= (float4KEY*) (((Nsrt*)a)->t);
64-
float4KEY*ib= (float4KEY*) (((Nsrt*)b)->t);
63+
float4KEY*ia= (float4KEY*) (((constNsrt*)a)->t);
64+
float4KEY*ib= (float4KEY*) (((constNsrt*)b)->t);
6565

6666
if (ia->lower==ib->lower)
6767
{

‎contrib/btree_gist/btree_float8.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,34 @@ Datumgbt_float8_same(PG_FUNCTION_ARGS);
3535
staticbool
3636
gbt_float8gt(constvoid*a,constvoid*b)
3737
{
38-
return (*((float8*)a)>*((float8*)b));
38+
return (*((constfloat8*)a)>*((constfloat8*)b));
3939
}
4040
staticbool
4141
gbt_float8ge(constvoid*a,constvoid*b)
4242
{
43-
return (*((float8*)a) >=*((float8*)b));
43+
return (*((constfloat8*)a) >=*((constfloat8*)b));
4444
}
4545
staticbool
4646
gbt_float8eq(constvoid*a,constvoid*b)
4747
{
48-
return (*((float8*)a)==*((float8*)b));
48+
return (*((constfloat8*)a)==*((constfloat8*)b));
4949
}
5050
staticbool
5151
gbt_float8le(constvoid*a,constvoid*b)
5252
{
53-
return (*((float8*)a) <=*((float8*)b));
53+
return (*((constfloat8*)a) <=*((constfloat8*)b));
5454
}
5555
staticbool
5656
gbt_float8lt(constvoid*a,constvoid*b)
5757
{
58-
return (*((float8*)a)<*((float8*)b));
58+
return (*((constfloat8*)a)<*((constfloat8*)b));
5959
}
6060

6161
staticint
6262
gbt_float8key_cmp(constvoid*a,constvoid*b)
6363
{
64-
float8KEY*ia= (float8KEY*) (((Nsrt*)a)->t);
65-
float8KEY*ib= (float8KEY*) (((Nsrt*)b)->t);
64+
float8KEY*ia= (float8KEY*) (((constNsrt*)a)->t);
65+
float8KEY*ib= (float8KEY*) (((constNsrt*)b)->t);
6666

6767
if (ia->lower==ib->lower)
6868
{

‎contrib/btree_gist/btree_inet.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,34 @@ Datumgbt_inet_same(PG_FUNCTION_ARGS);
3636
staticbool
3737
gbt_inetgt(constvoid*a,constvoid*b)
3838
{
39-
return (*((double*)a)>*((double*)b));
39+
return (*((constdouble*)a)>*((constdouble*)b));
4040
}
4141
staticbool
4242
gbt_inetge(constvoid*a,constvoid*b)
4343
{
44-
return (*((double*)a) >=*((double*)b));
44+
return (*((constdouble*)a) >=*((constdouble*)b));
4545
}
4646
staticbool
4747
gbt_ineteq(constvoid*a,constvoid*b)
4848
{
49-
return (*((double*)a)==*((double*)b));
49+
return (*((constdouble*)a)==*((constdouble*)b));
5050
}
5151
staticbool
5252
gbt_inetle(constvoid*a,constvoid*b)
5353
{
54-
return (*((double*)a) <=*((double*)b));
54+
return (*((constdouble*)a) <=*((constdouble*)b));
5555
}
5656
staticbool
5757
gbt_inetlt(constvoid*a,constvoid*b)
5858
{
59-
return (*((double*)a)<*((double*)b));
59+
return (*((constdouble*)a)<*((constdouble*)b));
6060
}
6161

6262
staticint
6363
gbt_inetkey_cmp(constvoid*a,constvoid*b)
6464
{
65-
inetKEY*ia= (inetKEY*) (((Nsrt*)a)->t);
66-
inetKEY*ib= (inetKEY*) (((Nsrt*)b)->t);
65+
inetKEY*ia= (inetKEY*) (((constNsrt*)a)->t);
66+
inetKEY*ib= (inetKEY*) (((constNsrt*)b)->t);
6767

6868
if (ia->lower==ib->lower)
6969
{

‎contrib/btree_gist/btree_int2.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,34 +34,34 @@ Datumgbt_int2_same(PG_FUNCTION_ARGS);
3434
staticbool
3535
gbt_int2gt(constvoid*a,constvoid*b)
3636
{
37-
return (*((int16*)a)>*((int16*)b));
37+
return (*((constint16*)a)>*((constint16*)b));
3838
}
3939
staticbool
4040
gbt_int2ge(constvoid*a,constvoid*b)
4141
{
42-
return (*((int16*)a) >=*((int16*)b));
42+
return (*((constint16*)a) >=*((constint16*)b));
4343
}
4444
staticbool
4545
gbt_int2eq(constvoid*a,constvoid*b)
4646
{
47-
return (*((int16*)a)==*((int16*)b));
47+
return (*((constint16*)a)==*((constint16*)b));
4848
}
4949
staticbool
5050
gbt_int2le(constvoid*a,constvoid*b)
5151
{
52-
return (*((int16*)a) <=*((int16*)b));
52+
return (*((constint16*)a) <=*((constint16*)b));
5353
}
5454
staticbool
5555
gbt_int2lt(constvoid*a,constvoid*b)
5656
{
57-
return (*((int16*)a)<*((int16*)b));
57+
return (*((constint16*)a)<*((constint16*)b));
5858
}
5959

6060
staticint
6161
gbt_int2key_cmp(constvoid*a,constvoid*b)
6262
{
63-
int16KEY*ia= (int16KEY*) (((Nsrt*)a)->t);
64-
int16KEY*ib= (int16KEY*) (((Nsrt*)b)->t);
63+
int16KEY*ia= (int16KEY*) (((constNsrt*)a)->t);
64+
int16KEY*ib= (int16KEY*) (((constNsrt*)b)->t);
6565

6666
if (ia->lower==ib->lower)
6767
{

‎contrib/btree_gist/btree_int4.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,34 @@ Datumgbt_int4_same(PG_FUNCTION_ARGS);
3535
staticbool
3636
gbt_int4gt(constvoid*a,constvoid*b)
3737
{
38-
return (*((int32*)a)>*((int32*)b));
38+
return (*((constint32*)a)>*((constint32*)b));
3939
}
4040
staticbool
4141
gbt_int4ge(constvoid*a,constvoid*b)
4242
{
43-
return (*((int32*)a) >=*((int32*)b));
43+
return (*((constint32*)a) >=*((constint32*)b));
4444
}
4545
staticbool
4646
gbt_int4eq(constvoid*a,constvoid*b)
4747
{
48-
return (*((int32*)a)==*((int32*)b));
48+
return (*((constint32*)a)==*((constint32*)b));
4949
}
5050
staticbool
5151
gbt_int4le(constvoid*a,constvoid*b)
5252
{
53-
return (*((int32*)a) <=*((int32*)b));
53+
return (*((constint32*)a) <=*((constint32*)b));
5454
}
5555
staticbool
5656
gbt_int4lt(constvoid*a,constvoid*b)
5757
{
58-
return (*((int32*)a)<*((int32*)b));
58+
return (*((constint32*)a)<*((constint32*)b));
5959
}
6060

6161
staticint
6262
gbt_int4key_cmp(constvoid*a,constvoid*b)
6363
{
64-
int32KEY*ia= (int32KEY*) (((Nsrt*)a)->t);
65-
int32KEY*ib= (int32KEY*) (((Nsrt*)b)->t);
64+
int32KEY*ia= (int32KEY*) (((constNsrt*)a)->t);
65+
int32KEY*ib= (int32KEY*) (((constNsrt*)b)->t);
6666

6767
if (ia->lower==ib->lower)
6868
{

‎contrib/btree_gist/btree_int8.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,34 @@ Datumgbt_int8_same(PG_FUNCTION_ARGS);
3535
staticbool
3636
gbt_int8gt(constvoid*a,constvoid*b)
3737
{
38-
return (*((int64*)a)>*((int64*)b));
38+
return (*((constint64*)a)>*((constint64*)b));
3939
}
4040
staticbool
4141
gbt_int8ge(constvoid*a,constvoid*b)
4242
{
43-
return (*((int64*)a) >=*((int64*)b));
43+
return (*((constint64*)a) >=*((constint64*)b));
4444
}
4545
staticbool
4646
gbt_int8eq(constvoid*a,constvoid*b)
4747
{
48-
return (*((int64*)a)==*((int64*)b));
48+
return (*((constint64*)a)==*((constint64*)b));
4949
}
5050
staticbool
5151
gbt_int8le(constvoid*a,constvoid*b)
5252
{
53-
return (*((int64*)a) <=*((int64*)b));
53+
return (*((constint64*)a) <=*((constint64*)b));
5454
}
5555
staticbool
5656
gbt_int8lt(constvoid*a,constvoid*b)
5757
{
58-
return (*((int64*)a)<*((int64*)b));
58+
return (*((constint64*)a)<*((constint64*)b));
5959
}
6060

6161
staticint
6262
gbt_int8key_cmp(constvoid*a,constvoid*b)
6363
{
64-
int64KEY*ia= (int64KEY*) (((Nsrt*)a)->t);
65-
int64KEY*ib= (int64KEY*) (((Nsrt*)b)->t);
64+
int64KEY*ia= (int64KEY*) (((constNsrt*)a)->t);
65+
int64KEY*ib= (int64KEY*) (((constNsrt*)b)->t);
6666

6767
if (ia->lower==ib->lower)
6868
{

‎contrib/btree_gist/btree_interval.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ gbt_intvlt(const void *a, const void *b)
6969
staticint
7070
gbt_intvkey_cmp(constvoid*a,constvoid*b)
7171
{
72-
intvKEY*ia= (intvKEY*) (((Nsrt*)a)->t);
73-
intvKEY*ib= (intvKEY*) (((Nsrt*)b)->t);
72+
intvKEY*ia= (intvKEY*) (((constNsrt*)a)->t);
73+
intvKEY*ib= (intvKEY*) (((constNsrt*)b)->t);
7474
intres;
7575

7676
res=DatumGetInt32(DirectFunctionCall2(interval_cmp,IntervalPGetDatum(&ia->lower),IntervalPGetDatum(&ib->lower)));
@@ -90,7 +90,7 @@ intr2num(const Interval *i)
9090
staticfloat8
9191
gbt_intv_dist(constvoid*a,constvoid*b)
9292
{
93-
return (float8)Abs(intr2num((Interval*)a)-intr2num((Interval*)b));
93+
return (float8)Abs(intr2num((constInterval*)a)-intr2num((constInterval*)b));
9494
}
9595

9696
/*

‎contrib/btree_gist/btree_macaddr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ gbt_macadlt(const void *a, const void *b)
6565
staticint
6666
gbt_macadkey_cmp(constvoid*a,constvoid*b)
6767
{
68-
macKEY*ia= (macKEY*) (((Nsrt*)a)->t);
69-
macKEY*ib= (macKEY*) (((Nsrt*)b)->t);
68+
macKEY*ia= (macKEY*) (((constNsrt*)a)->t);
69+
macKEY*ib= (macKEY*) (((constNsrt*)b)->t);
7070
intres;
7171

7272
res=DatumGetInt32(DirectFunctionCall2(macaddr_cmp,MacaddrPGetDatum(&ia->lower),MacaddrPGetDatum(&ib->lower)));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp