Skip to content

Commit 1b81c2f

Browse files
peterepetere
committed
Remove many -Wcast-qual warnings
This addresses only those cases that are easy to fix by adding or moving a const qualifier or removing an unnecessary cast. There are many more complicated cases remaining.
1 parent 02bca4f commit 1b81c2f

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 @@ Datum gbt_cash_same(PG_FUNCTION_ARGS);
3535
static bool
3636
gbt_cashgt(const void *a, const void *b)
3737
{
38-
return (*((Cash *) a) > *((Cash *) b));
38+
return (*((const Cash *) a) > *((const Cash *) b));
3939
}
4040
static bool
4141
gbt_cashge(const void *a, const void *b)
4242
{
43-
return (*((Cash *) a) >= *((Cash *) b));
43+
return (*((const Cash *) a) >= *((const Cash *) b));
4444
}
4545
static bool
4646
gbt_casheq(const void *a, const void *b)
4747
{
48-
return (*((Cash *) a) == *((Cash *) b));
48+
return (*((const Cash *) a) == *((const Cash *) b));
4949
}
5050
static bool
5151
gbt_cashle(const void *a, const void *b)
5252
{
53-
return (*((Cash *) a) <= *((Cash *) b));
53+
return (*((const Cash *) a) <= *((const Cash *) b));
5454
}
5555
static bool
5656
gbt_cashlt(const void *a, const void *b)
5757
{
58-
return (*((Cash *) a) < *((Cash *) b));
58+
return (*((const Cash *) a) < *((const Cash *) b));
5959
}
6060

6161
static int
6262
gbt_cashkey_cmp(const void *a, const void *b)
6363
{
64-
cashKEY *ia = (cashKEY *) (((Nsrt *) a)->t);
65-
cashKEY *ib = (cashKEY *) (((Nsrt *) b)->t);
64+
cashKEY *ia = (cashKEY *) (((const Nsrt *) a)->t);
65+
cashKEY *ib = (cashKEY *) (((const Nsrt *) 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(const void *a, const void *b)
3737
{
3838
return DatumGetBool(
39-
DirectFunctionCall2(date_gt, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
39+
DirectFunctionCall2(date_gt, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
4040
);
4141
}
4242

4343
static bool
4444
gbt_datege(const void *a, const void *b)
4545
{
4646
return DatumGetBool(
47-
DirectFunctionCall2(date_ge, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
47+
DirectFunctionCall2(date_ge, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
4848
);
4949
}
5050

5151
static bool
5252
gbt_dateeq(const void *a, const void *b)
5353
{
5454
return DatumGetBool(
55-
DirectFunctionCall2(date_eq, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
55+
DirectFunctionCall2(date_eq, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
5656
);
5757
}
5858

5959
static bool
6060
gbt_datele(const void *a, const void *b)
6161
{
6262
return DatumGetBool(
63-
DirectFunctionCall2(date_le, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
63+
DirectFunctionCall2(date_le, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
6464
);
6565
}
6666

6767
static bool
6868
gbt_datelt(const void *a, const void *b)
6969
{
7070
return DatumGetBool(
71-
DirectFunctionCall2(date_lt, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
71+
DirectFunctionCall2(date_lt, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
7272
);
7373
}
7474

@@ -77,8 +77,8 @@ gbt_datelt(const void *a, const void *b)
7777
static int
7878
gbt_datekey_cmp(const void *a, const void *b)
7979
{
80-
dateKEY *ia = (dateKEY *) (((Nsrt *) a)->t);
81-
dateKEY *ib = (dateKEY *) (((Nsrt *) b)->t);
80+
dateKEY *ia = (dateKEY *) (((const Nsrt *) a)->t);
81+
dateKEY *ib = (dateKEY *) (((const Nsrt *) b)->t);
8282
int res;
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 @@ Datum gbt_float4_same(PG_FUNCTION_ARGS);
3434
static bool
3535
gbt_float4gt(const void *a, const void *b)
3636
{
37-
return (*((float4 *) a) > *((float4 *) b));
37+
return (*((const float4 *) a) > *((const float4 *) b));
3838
}
3939
static bool
4040
gbt_float4ge(const void *a, const void *b)
4141
{
42-
return (*((float4 *) a) >= *((float4 *) b));
42+
return (*((const float4 *) a) >= *((const float4 *) b));
4343
}
4444
static bool
4545
gbt_float4eq(const void *a, const void *b)
4646
{
47-
return (*((float4 *) a) == *((float4 *) b));
47+
return (*((const float4 *) a) == *((const float4 *) b));
4848
}
4949
static bool
5050
gbt_float4le(const void *a, const void *b)
5151
{
52-
return (*((float4 *) a) <= *((float4 *) b));
52+
return (*((const float4 *) a) <= *((const float4 *) b));
5353
}
5454
static bool
5555
gbt_float4lt(const void *a, const void *b)
5656
{
57-
return (*((float4 *) a) < *((float4 *) b));
57+
return (*((const float4 *) a) < *((const float4 *) b));
5858
}
5959

6060
static int
6161
gbt_float4key_cmp(const void *a, const void *b)
6262
{
63-
float4KEY *ia = (float4KEY *) (((Nsrt *) a)->t);
64-
float4KEY *ib = (float4KEY *) (((Nsrt *) b)->t);
63+
float4KEY *ia = (float4KEY *) (((const Nsrt *) a)->t);
64+
float4KEY *ib = (float4KEY *) (((const Nsrt *) 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 @@ Datum gbt_float8_same(PG_FUNCTION_ARGS);
3535
static bool
3636
gbt_float8gt(const void *a, const void *b)
3737
{
38-
return (*((float8 *) a) > *((float8 *) b));
38+
return (*((const float8 *) a) > *((const float8 *) b));
3939
}
4040
static bool
4141
gbt_float8ge(const void *a, const void *b)
4242
{
43-
return (*((float8 *) a) >= *((float8 *) b));
43+
return (*((const float8 *) a) >= *((const float8 *) b));
4444
}
4545
static bool
4646
gbt_float8eq(const void *a, const void *b)
4747
{
48-
return (*((float8 *) a) == *((float8 *) b));
48+
return (*((const float8 *) a) == *((const float8 *) b));
4949
}
5050
static bool
5151
gbt_float8le(const void *a, const void *b)
5252
{
53-
return (*((float8 *) a) <= *((float8 *) b));
53+
return (*((const float8 *) a) <= *((const float8 *) b));
5454
}
5555
static bool
5656
gbt_float8lt(const void *a, const void *b)
5757
{
58-
return (*((float8 *) a) < *((float8 *) b));
58+
return (*((const float8 *) a) < *((const float8 *) b));
5959
}
6060

6161
static int
6262
gbt_float8key_cmp(const void *a, const void *b)
6363
{
64-
float8KEY *ia = (float8KEY *) (((Nsrt *) a)->t);
65-
float8KEY *ib = (float8KEY *) (((Nsrt *) b)->t);
64+
float8KEY *ia = (float8KEY *) (((const Nsrt *) a)->t);
65+
float8KEY *ib = (float8KEY *) (((const Nsrt *) 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 @@ Datum gbt_inet_same(PG_FUNCTION_ARGS);
3636
static bool
3737
gbt_inetgt(const void *a, const void *b)
3838
{
39-
return (*((double *) a) > *((double *) b));
39+
return (*((const double *) a) > *((const double *) b));
4040
}
4141
static bool
4242
gbt_inetge(const void *a, const void *b)
4343
{
44-
return (*((double *) a) >= *((double *) b));
44+
return (*((const double *) a) >= *((const double *) b));
4545
}
4646
static bool
4747
gbt_ineteq(const void *a, const void *b)
4848
{
49-
return (*((double *) a) == *((double *) b));
49+
return (*((const double *) a) == *((const double *) b));
5050
}
5151
static bool
5252
gbt_inetle(const void *a, const void *b)
5353
{
54-
return (*((double *) a) <= *((double *) b));
54+
return (*((const double *) a) <= *((const double *) b));
5555
}
5656
static bool
5757
gbt_inetlt(const void *a, const void *b)
5858
{
59-
return (*((double *) a) < *((double *) b));
59+
return (*((const double *) a) < *((const double *) b));
6060
}
6161

6262
static int
6363
gbt_inetkey_cmp(const void *a, const void *b)
6464
{
65-
inetKEY *ia = (inetKEY *) (((Nsrt *) a)->t);
66-
inetKEY *ib = (inetKEY *) (((Nsrt *) b)->t);
65+
inetKEY *ia = (inetKEY *) (((const Nsrt *) a)->t);
66+
inetKEY *ib = (inetKEY *) (((const Nsrt *) 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 @@ Datum gbt_int2_same(PG_FUNCTION_ARGS);
3434
static bool
3535
gbt_int2gt(const void *a, const void *b)
3636
{
37-
return (*((int16 *) a) > *((int16 *) b));
37+
return (*((const int16 *) a) > *((const int16 *) b));
3838
}
3939
static bool
4040
gbt_int2ge(const void *a, const void *b)
4141
{
42-
return (*((int16 *) a) >= *((int16 *) b));
42+
return (*((const int16 *) a) >= *((const int16 *) b));
4343
}
4444
static bool
4545
gbt_int2eq(const void *a, const void *b)
4646
{
47-
return (*((int16 *) a) == *((int16 *) b));
47+
return (*((const int16 *) a) == *((const int16 *) b));
4848
}
4949
static bool
5050
gbt_int2le(const void *a, const void *b)
5151
{
52-
return (*((int16 *) a) <= *((int16 *) b));
52+
return (*((const int16 *) a) <= *((const int16 *) b));
5353
}
5454
static bool
5555
gbt_int2lt(const void *a, const void *b)
5656
{
57-
return (*((int16 *) a) < *((int16 *) b));
57+
return (*((const int16 *) a) < *((const int16 *) b));
5858
}
5959

6060
static int
6161
gbt_int2key_cmp(const void *a, const void *b)
6262
{
63-
int16KEY *ia = (int16KEY *) (((Nsrt *) a)->t);
64-
int16KEY *ib = (int16KEY *) (((Nsrt *) b)->t);
63+
int16KEY *ia = (int16KEY *) (((const Nsrt *) a)->t);
64+
int16KEY *ib = (int16KEY *) (((const Nsrt *) 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 @@ Datum gbt_int4_same(PG_FUNCTION_ARGS);
3535
static bool
3636
gbt_int4gt(const void *a, const void *b)
3737
{
38-
return (*((int32 *) a) > *((int32 *) b));
38+
return (*((const int32 *) a) > *((const int32 *) b));
3939
}
4040
static bool
4141
gbt_int4ge(const void *a, const void *b)
4242
{
43-
return (*((int32 *) a) >= *((int32 *) b));
43+
return (*((const int32 *) a) >= *((const int32 *) b));
4444
}
4545
static bool
4646
gbt_int4eq(const void *a, const void *b)
4747
{
48-
return (*((int32 *) a) == *((int32 *) b));
48+
return (*((const int32 *) a) == *((const int32 *) b));
4949
}
5050
static bool
5151
gbt_int4le(const void *a, const void *b)
5252
{
53-
return (*((int32 *) a) <= *((int32 *) b));
53+
return (*((const int32 *) a) <= *((const int32 *) b));
5454
}
5555
static bool
5656
gbt_int4lt(const void *a, const void *b)
5757
{
58-
return (*((int32 *) a) < *((int32 *) b));
58+
return (*((const int32 *) a) < *((const int32 *) b));
5959
}
6060

6161
static int
6262
gbt_int4key_cmp(const void *a, const void *b)
6363
{
64-
int32KEY *ia = (int32KEY *) (((Nsrt *) a)->t);
65-
int32KEY *ib = (int32KEY *) (((Nsrt *) b)->t);
64+
int32KEY *ia = (int32KEY *) (((const Nsrt *) a)->t);
65+
int32KEY *ib = (int32KEY *) (((const Nsrt *) 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 @@ Datum gbt_int8_same(PG_FUNCTION_ARGS);
3535
static bool
3636
gbt_int8gt(const void *a, const void *b)
3737
{
38-
return (*((int64 *) a) > *((int64 *) b));
38+
return (*((const int64 *) a) > *((const int64 *) b));
3939
}
4040
static bool
4141
gbt_int8ge(const void *a, const void *b)
4242
{
43-
return (*((int64 *) a) >= *((int64 *) b));
43+
return (*((const int64 *) a) >= *((const int64 *) b));
4444
}
4545
static bool
4646
gbt_int8eq(const void *a, const void *b)
4747
{
48-
return (*((int64 *) a) == *((int64 *) b));
48+
return (*((const int64 *) a) == *((const int64 *) b));
4949
}
5050
static bool
5151
gbt_int8le(const void *a, const void *b)
5252
{
53-
return (*((int64 *) a) <= *((int64 *) b));
53+
return (*((const int64 *) a) <= *((const int64 *) b));
5454
}
5555
static bool
5656
gbt_int8lt(const void *a, const void *b)
5757
{
58-
return (*((int64 *) a) < *((int64 *) b));
58+
return (*((const int64 *) a) < *((const int64 *) b));
5959
}
6060

6161
static int
6262
gbt_int8key_cmp(const void *a, const void *b)
6363
{
64-
int64KEY *ia = (int64KEY *) (((Nsrt *) a)->t);
65-
int64KEY *ib = (int64KEY *) (((Nsrt *) b)->t);
64+
int64KEY *ia = (int64KEY *) (((const Nsrt *) a)->t);
65+
int64KEY *ib = (int64KEY *) (((const Nsrt *) 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
static int
7070
gbt_intvkey_cmp(const void *a, const void *b)
7171
{
72-
intvKEY *ia = (intvKEY *) (((Nsrt *) a)->t);
73-
intvKEY *ib = (intvKEY *) (((Nsrt *) b)->t);
72+
intvKEY *ia = (intvKEY *) (((const Nsrt *) a)->t);
73+
intvKEY *ib = (intvKEY *) (((const Nsrt *) b)->t);
7474
int res;
7575

7676
res = DatumGetInt32(DirectFunctionCall2(interval_cmp, IntervalPGetDatum(&ia->lower), IntervalPGetDatum(&ib->lower)));
@@ -90,7 +90,7 @@ intr2num(const Interval *i)
9090
static float8
9191
gbt_intv_dist(const void *a, const void *b)
9292
{
93-
return (float8) Abs(intr2num((Interval *) a) - intr2num((Interval *) b));
93+
return (float8) Abs(intr2num((const Interval *) a) - intr2num((const Interval *) 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
static int
6666
gbt_macadkey_cmp(const void *a, const void *b)
6767
{
68-
macKEY *ia = (macKEY *) (((Nsrt *) a)->t);
69-
macKEY *ib = (macKEY *) (((Nsrt *) b)->t);
68+
macKEY *ia = (macKEY *) (((const Nsrt *) a)->t);
69+
macKEY *ib = (macKEY *) (((const Nsrt *) b)->t);
7070
int res;
7171

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy