mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove many -Wcast-qual warnings

Browse Source 
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.
This commit is contained in:
Peter Eisentraut 2011-09-11 21:54:32 +03:00
parent 02bca4f351
commit 1b81c2fe6e
55 changed files with 219 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/btree_gist/btree_cash.c
View File

@ -35,34 +35,34 @@ Datum gbt_cash_same(PG_FUNCTION_ARGS);
static bool
gbt_cashgt(const void *a, const void *b)
{
return (*((Cash *) a) > *((Cash *) b));
return (*((const Cash *) a) > *((const Cash *) b));
}
static bool
gbt_cashge(const void *a, const void *b)
{
return (*((Cash *) a) >= *((Cash *) b));
return (*((const Cash *) a) >= *((const Cash *) b));
}
static bool
gbt_casheq(const void *a, const void *b)
{
return (*((Cash *) a) == *((Cash *) b));
return (*((const Cash *) a) == *((const Cash *) b));
}
static bool
gbt_cashle(const void *a, const void *b)
{
return (*((Cash *) a) <= *((Cash *) b));
return (*((const Cash *) a) <= *((const Cash *) b));
}
static bool
gbt_cashlt(const void *a, const void *b)
{
return (*((Cash *) a) < *((Cash *) b));
return (*((const Cash *) a) < *((const Cash *) b));
}
static int
gbt_cashkey_cmp(const void *a, const void *b)
{
cashKEY *ia = (cashKEY *) (((Nsrt *) a)->t);
cashKEY *ib = (cashKEY *) (((Nsrt *) b)->t);
cashKEY *ia = (cashKEY *) (((const Nsrt *) a)->t);
cashKEY *ib = (cashKEY *) (((const Nsrt *) b)->t);
if (ia->lower == ib->lower)
{

14
contrib/btree_gist/btree_date.c
View File

@ -36,7 +36,7 @@ static bool
gbt_dategt(const void *a, const void *b)
{
return DatumGetBool(
DirectFunctionCall2(date_gt, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
DirectFunctionCall2(date_gt, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
);
}
@ -44,7 +44,7 @@ static bool
gbt_datege(const void *a, const void *b)
{
return DatumGetBool(
DirectFunctionCall2(date_ge, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
DirectFunctionCall2(date_ge, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
);
}
@ -52,7 +52,7 @@ static bool
gbt_dateeq(const void *a, const void *b)
{
return DatumGetBool(
DirectFunctionCall2(date_eq, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
DirectFunctionCall2(date_eq, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
);
}
@ -60,7 +60,7 @@ static bool
gbt_datele(const void *a, const void *b)
{
return DatumGetBool(
DirectFunctionCall2(date_le, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
DirectFunctionCall2(date_le, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
);
}
@ -68,7 +68,7 @@ static bool
gbt_datelt(const void *a, const void *b)
{
return DatumGetBool(
DirectFunctionCall2(date_lt, DateADTGetDatum(*((DateADT *) a)), DateADTGetDatum(*((DateADT *) b)))
DirectFunctionCall2(date_lt, DateADTGetDatum(*((const DateADT *) a)), DateADTGetDatum(*((const DateADT *) b)))
);
}
@ -77,8 +77,8 @@ gbt_datelt(const void *a, const void *b)
static int
gbt_datekey_cmp(const void *a, const void *b)
{
dateKEY *ia = (dateKEY *) (((Nsrt *) a)->t);
dateKEY *ib = (dateKEY *) (((Nsrt *) b)->t);
dateKEY *ia = (dateKEY *) (((const Nsrt *) a)->t);
dateKEY *ib = (dateKEY *) (((const Nsrt *) b)->t);
int res;
res = DatumGetInt32(DirectFunctionCall2(date_cmp, DateADTGetDatum(ia->lower), DateADTGetDatum(ib->lower)));

14
contrib/btree_gist/btree_float4.c
View File

@ -34,34 +34,34 @@ Datum gbt_float4_same(PG_FUNCTION_ARGS);
static bool
gbt_float4gt(const void *a, const void *b)
{
return (*((float4 *) a) > *((float4 *) b));
return (*((const float4 *) a) > *((const float4 *) b));
}
static bool
gbt_float4ge(const void *a, const void *b)
{
return (*((float4 *) a) >= *((float4 *) b));
return (*((const float4 *) a) >= *((const float4 *) b));
}
static bool
gbt_float4eq(const void *a, const void *b)
{
return (*((float4 *) a) == *((float4 *) b));
return (*((const float4 *) a) == *((const float4 *) b));
}
static bool
gbt_float4le(const void *a, const void *b)
{
return (*((float4 *) a) <= *((float4 *) b));
return (*((const float4 *) a) <= *((const float4 *) b));
}
static bool
gbt_float4lt(const void *a, const void *b)
{
return (*((float4 *) a) < *((float4 *) b));
return (*((const float4 *) a) < *((const float4 *) b));
}
static int
gbt_float4key_cmp(const void *a, const void *b)
{
float4KEY *ia = (float4KEY *) (((Nsrt *) a)->t);
float4KEY *ib = (float4KEY *) (((Nsrt *) b)->t);
float4KEY *ia = (float4KEY *) (((const Nsrt *) a)->t);
float4KEY *ib = (float4KEY *) (((const Nsrt *) b)->t);
if (ia->lower == ib->lower)
{

14
contrib/btree_gist/btree_float8.c
View File

@ -35,34 +35,34 @@ Datum gbt_float8_same(PG_FUNCTION_ARGS);
static bool
gbt_float8gt(const void *a, const void *b)
{
return (*((float8 *) a) > *((float8 *) b));
return (*((const float8 *) a) > *((const float8 *) b));
}
static bool
gbt_float8ge(const void *a, const void *b)
{
return (*((float8 *) a) >= *((float8 *) b));
return (*((const float8 *) a) >= *((const float8 *) b));
}
static bool
gbt_float8eq(const void *a, const void *b)
{
return (*((float8 *) a) == *((float8 *) b));
return (*((const float8 *) a) == *((const float8 *) b));
}
static bool
gbt_float8le(const void *a, const void *b)
{
return (*((float8 *) a) <= *((float8 *) b));
return (*((const float8 *) a) <= *((const float8 *) b));
}
static bool
gbt_float8lt(const void *a, const void *b)
{
return (*((float8 *) a) < *((float8 *) b));
return (*((const float8 *) a) < *((const float8 *) b));
}
static int
gbt_float8key_cmp(const void *a, const void *b)
{
float8KEY *ia = (float8KEY *) (((Nsrt *) a)->t);
float8KEY *ib = (float8KEY *) (((Nsrt *) b)->t);
float8KEY *ia = (float8KEY *) (((const Nsrt *) a)->t);
float8KEY *ib = (float8KEY *) (((const Nsrt *) b)->t);
if (ia->lower == ib->lower)
{

14
contrib/btree_gist/btree_inet.c
View File

@ -36,34 +36,34 @@ Datum gbt_inet_same(PG_FUNCTION_ARGS);
static bool
gbt_inetgt(const void *a, const void *b)
{
return (*((double *) a) > *((double *) b));
return (*((const double *) a) > *((const double *) b));
}
static bool
gbt_inetge(const void *a, const void *b)
{
return (*((double *) a) >= *((double *) b));
return (*((const double *) a) >= *((const double *) b));
}
static bool
gbt_ineteq(const void *a, const void *b)
{
return (*((double *) a) == *((double *) b));
return (*((const double *) a) == *((const double *) b));
}
static bool
gbt_inetle(const void *a, const void *b)
{
return (*((double *) a) <= *((double *) b));
return (*((const double *) a) <= *((const double *) b));
}
static bool
gbt_inetlt(const void *a, const void *b)
{
return (*((double *) a) < *((double *) b));
return (*((const double *) a) < *((const double *) b));
}
static int
gbt_inetkey_cmp(const void *a, const void *b)
{
inetKEY *ia = (inetKEY *) (((Nsrt *) a)->t);
inetKEY *ib = (inetKEY *) (((Nsrt *) b)->t);
inetKEY *ia = (inetKEY *) (((const Nsrt *) a)->t);
inetKEY *ib = (inetKEY *) (((const Nsrt *) b)->t);
if (ia->lower == ib->lower)
{

14
contrib/btree_gist/btree_int2.c
View File

@ -34,34 +34,34 @@ Datum gbt_int2_same(PG_FUNCTION_ARGS);
static bool
gbt_int2gt(const void *a, const void *b)
{
return (*((int16 *) a) > *((int16 *) b));
return (*((const int16 *) a) > *((const int16 *) b));
}
static bool
gbt_int2ge(const void *a, const void *b)
{
return (*((int16 *) a) >= *((int16 *) b));
return (*((const int16 *) a) >= *((const int16 *) b));
}
static bool
gbt_int2eq(const void *a, const void *b)
{
return (*((int16 *) a) == *((int16 *) b));
return (*((const int16 *) a) == *((const int16 *) b));
}
static bool
gbt_int2le(const void *a, const void *b)
{
return (*((int16 *) a) <= *((int16 *) b));
return (*((const int16 *) a) <= *((const int16 *) b));
}
static bool
gbt_int2lt(const void *a, const void *b)
{
return (*((int16 *) a) < *((int16 *) b));
return (*((const int16 *) a) < *((const int16 *) b));
}
static int
gbt_int2key_cmp(const void *a, const void *b)
{
int16KEY *ia = (int16KEY *) (((Nsrt *) a)->t);
int16KEY *ib = (int16KEY *) (((Nsrt *) b)->t);
int16KEY *ia = (int16KEY *) (((const Nsrt *) a)->t);
int16KEY *ib = (int16KEY *) (((const Nsrt *) b)->t);
if (ia->lower == ib->lower)
{

14
contrib/btree_gist/btree_int4.c
View File

@ -35,34 +35,34 @@ Datum gbt_int4_same(PG_FUNCTION_ARGS);
static bool
gbt_int4gt(const void *a, const void *b)
{
return (*((int32 *) a) > *((int32 *) b));
return (*((const int32 *) a) > *((const int32 *) b));
}
static bool
gbt_int4ge(const void *a, const void *b)
{
return (*((int32 *) a) >= *((int32 *) b));
return (*((const int32 *) a) >= *((const int32 *) b));
}
static bool
gbt_int4eq(const void *a, const void *b)
{
return (*((int32 *) a) == *((int32 *) b));
return (*((const int32 *) a) == *((const int32 *) b));
}
static bool
gbt_int4le(const void *a, const void *b)
{
return (*((int32 *) a) <= *((int32 *) b));
return (*((const int32 *) a) <= *((const int32 *) b));
}
static bool
gbt_int4lt(const void *a, const void *b)
{
return (*((int32 *) a) < *((int32 *) b));
return (*((const int32 *) a) < *((const int32 *) b));
}
static int
gbt_int4key_cmp(const void *a, const void *b)
{
int32KEY *ia = (int32KEY *) (((Nsrt *) a)->t);
int32KEY *ib = (int32KEY *) (((Nsrt *) b)->t);
int32KEY *ia = (int32KEY *) (((const Nsrt *) a)->t);
int32KEY *ib = (int32KEY *) (((const Nsrt *) b)->t);
if (ia->lower == ib->lower)
{

14
contrib/btree_gist/btree_int8.c
View File

@ -35,34 +35,34 @@ Datum gbt_int8_same(PG_FUNCTION_ARGS);
static bool
gbt_int8gt(const void *a, const void *b)
{
return (*((int64 *) a) > *((int64 *) b));
return (*((const int64 *) a) > *((const int64 *) b));
}
static bool
gbt_int8ge(const void *a, const void *b)
{
return (*((int64 *) a) >= *((int64 *) b));
return (*((const int64 *) a) >= *((const int64 *) b));
}
static bool
gbt_int8eq(const void *a, const void *b)
{
return (*((int64 *) a) == *((int64 *) b));
return (*((const int64 *) a) == *((const int64 *) b));
}
static bool
gbt_int8le(const void *a, const void *b)
{
return (*((int64 *) a) <= *((int64 *) b));
return (*((const int64 *) a) <= *((const int64 *) b));
}
static bool
gbt_int8lt(const void *a, const void *b)
{
return (*((int64 *) a) < *((int64 *) b));
return (*((const int64 *) a) < *((const int64 *) b));
}
static int
gbt_int8key_cmp(const void *a, const void *b)
{
int64KEY *ia = (int64KEY *) (((Nsrt *) a)->t);
int64KEY *ib = (int64KEY *) (((Nsrt *) b)->t);
int64KEY *ia = (int64KEY *) (((const Nsrt *) a)->t);
int64KEY *ib = (int64KEY *) (((const Nsrt *) b)->t);
if (ia->lower == ib->lower)
{

6
contrib/btree_gist/btree_interval.c
View File

@ -69,8 +69,8 @@ gbt_intvlt(const void *a, const void *b)
static int
gbt_intvkey_cmp(const void *a, const void *b)
{
intvKEY *ia = (intvKEY *) (((Nsrt *) a)->t);
intvKEY *ib = (intvKEY *) (((Nsrt *) b)->t);
intvKEY *ia = (intvKEY *) (((const Nsrt *) a)->t);
intvKEY *ib = (intvKEY *) (((const Nsrt *) b)->t);
int res;
res = DatumGetInt32(DirectFunctionCall2(interval_cmp, IntervalPGetDatum(&ia->lower), IntervalPGetDatum(&ib->lower)));
@ -90,7 +90,7 @@ intr2num(const Interval *i)
static float8
gbt_intv_dist(const void *a, const void *b)
{
return (float8) Abs(intr2num((Interval *) a) - intr2num((Interval *) b));
return (float8) Abs(intr2num((const Interval *) a) - intr2num((const Interval *) b));
}
/*

4
contrib/btree_gist/btree_macaddr.c
View File

@ -65,8 +65,8 @@ gbt_macadlt(const void *a, const void *b)
static int
gbt_macadkey_cmp(const void *a, const void *b)
{
macKEY *ia = (macKEY *) (((Nsrt *) a)->t);
macKEY *ib = (macKEY *) (((Nsrt *) b)->t);
macKEY *ia = (macKEY *) (((const Nsrt *) a)->t);
macKEY *ib = (macKEY *) (((const Nsrt *) b)->t);
int res;
res = DatumGetInt32(DirectFunctionCall2(macaddr_cmp, MacaddrPGetDatum(&ia->lower), MacaddrPGetDatum(&ib->lower)));

14
contrib/btree_gist/btree_oid.c
View File

@ -35,34 +35,34 @@ Datum gbt_oid_same(PG_FUNCTION_ARGS);
static bool
gbt_oidgt(const void *a, const void *b)
{
return (*((Oid *) a) > *((Oid *) b));
return (*((const Oid *) a) > *((const Oid *) b));
}
static bool
gbt_oidge(const void *a, const void *b)
{
return (*((Oid *) a) >= *((Oid *) b));
return (*((const Oid *) a) >= *((const Oid *) b));
}
static bool
gbt_oideq(const void *a, const void *b)
{
return (*((Oid *) a) == *((Oid *) b));
return (*((const Oid *) a) == *((const Oid *) b));
}
static bool
gbt_oidle(const void *a, const void *b)
{
return (*((Oid *) a) <= *((Oid *) b));
return (*((const Oid *) a) <= *((const Oid *) b));
}
static bool
gbt_oidlt(const void *a, const void *b)
{
return (*((Oid *) a) < *((Oid *) b));
return (*((const Oid *) a) < *((const Oid *) b));
}
static int
gbt_oidkey_cmp(const void *a, const void *b)
{
oidKEY *ia = (oidKEY *) (((Nsrt *) a)->t);
oidKEY *ib = (oidKEY *) (((Nsrt *) b)->t);
oidKEY *ia = (oidKEY *) (((const Nsrt *) a)->t);
oidKEY *ib = (oidKEY *) (((const Nsrt *) b)->t);
if (ia->lower == ib->lower)
{

4
contrib/btree_gist/btree_time.c
View File

@ -105,8 +105,8 @@ gbt_timelt(const void *a, const void *b)
static int
gbt_timekey_cmp(const void *a, const void *b)
{
timeKEY *ia = (timeKEY *) (((Nsrt *) a)->t);
timeKEY *ib = (timeKEY *) (((Nsrt *) b)->t);
timeKEY *ia = (timeKEY *) (((const Nsrt *) a)->t);
timeKEY *ib = (timeKEY *) (((const Nsrt *) b)->t);
int res;
res = DatumGetInt32(DirectFunctionCall2(time_cmp, TimeADTGetDatumFast(ia->lower), TimeADTGetDatumFast(ib->lower)));

4
contrib/btree_gist/btree_ts.c
View File

@ -106,8 +106,8 @@ gbt_tslt(const void *a, const void *b)
static int
gbt_tskey_cmp(const void *a, const void *b)
{
tsKEY *ia = (tsKEY *) (((Nsrt *) a)->t);
tsKEY *ib = (tsKEY *) (((Nsrt *) b)->t);
tsKEY *ia = (tsKEY *) (((const Nsrt *) a)->t);
tsKEY *ib = (tsKEY *) (((const Nsrt *) b)->t);
int res;
res = DatumGetInt32(DirectFunctionCall2(timestamp_cmp, TimestampGetDatumFast(ia->lower), TimestampGetDatumFast(ib->lower)));

2
contrib/dict_xsyn/dict_xsyn.c
View File

@ -69,7 +69,7 @@ find_word(char *in, char **end)
static int
compare_syn(const void *a, const void *b)
{
return strcmp(((Syn *) a)->key, ((Syn *) b)->key);
return strcmp(((const Syn *) a)->key, ((const Syn *) b)->key);
}
static void

2
contrib/hstore/hstore_gist.c
View File

@ -322,7 +322,7 @@ typedef struct
static int
comparecost(const void *a, const void *b)
{
return ((SPLITCOST *) a)->cost - ((SPLITCOST *) b)->cost;
return ((const SPLITCOST *) a)->cost - ((const SPLITCOST *) b)->cost;
}

15
contrib/hstore/hstore_io.c
View File

@ -276,24 +276,25 @@ parse_hstore(HSParser *state)
static int
comparePairs(const void *a, const void *b)
{
if (((Pairs *) a)->keylen == ((Pairs *) b)->keylen)
const Pairs *pa = a;
const Pairs *pb = b;
if (pa->keylen == pb->keylen)
{
int res = memcmp(((Pairs *) a)->key,
((Pairs *) b)->key,
((Pairs *) a)->keylen);
int res = memcmp(pa->key, pb->key, pa->keylen);
if (res)
return res;
/* guarantee that needfree will be later */
if (((Pairs *) b)->needfree == ((Pairs *) a)->needfree)
if (pb->needfree == pa->needfree)
return 0;
else if (((Pairs *) a)->needfree)
else if (pa->needfree)
return 1;
else
return -1;
}
return (((Pairs *) a)->keylen > ((Pairs *) b)->keylen) ? 1 : -1;
return (pa->keylen > pb->keylen) ? 1 : -1;
}
/*

4
contrib/intarray/_int_gist.c
View File

@ -357,10 +357,10 @@ typedef struct
static int
comparecost(const void *a, const void *b)
{
if (((SPLITCOST *) a)->cost == ((SPLITCOST *) b)->cost)
if (((const SPLITCOST *) a)->cost == ((const SPLITCOST *) b)->cost)
return 0;
else
return (((SPLITCOST *) a)->cost > ((SPLITCOST *) b)->cost) ? 1 : -1;
return (((const SPLITCOST *) a)->cost > ((const SPLITCOST *) b)->cost) ? 1 : -1;
}
/*

8
contrib/intarray/_int_tool.c
View File

@ -388,15 +388,15 @@ int_to_intset(int32 n)
int
compASC(const void *a, const void *b)
{
if (*(int4 *) a == *(int4 *) b)
if (*(const int4 *) a == *(const int4 *) b)
return 0;
return (*(int4 *) a > *(int4 *) b) ? 1 : -1;
return (*(const int4 *) a > *(const int4 *) b) ? 1 : -1;
}
int
compDESC(const void *a, const void *b)
{
if (*(int4 *) a == *(int4 *) b)
if (*(const int4 *) a == *(const int4 *) b)
return 0;
return (*(int4 *) a < *(int4 *) b) ? 1 : -1;
return (*(const int4 *) a < *(const int4 *) b) ? 1 : -1;
}

2
contrib/ltree/_ltree_gist.c
View File

@ -280,7 +280,7 @@ typedef struct
static int
comparecost(const void *a, const void *b)
{
return ((SPLITCOST *) a)->cost - ((SPLITCOST *) b)->cost;
return ((const SPLITCOST *) a)->cost - ((const SPLITCOST *) b)->cost;
}
Datum

4
contrib/pg_stat_statements/pg_stat_statements.c
View File

@ -973,8 +973,8 @@ entry_alloc(pgssHashKey *key)
static int
entry_cmp(const void *lhs, const void *rhs)
{
double l_usage = (*(const pgssEntry **) lhs)->counters.usage;
double r_usage = (*(const pgssEntry **) rhs)->counters.usage;
double l_usage = (*(pgssEntry * const *) lhs)->counters.usage;
double r_usage = (*(pgssEntry * const *) rhs)->counters.usage;
if (l_usage < r_usage)
return -1;

2
contrib/pg_trgm/trgm.h
View File

@ -33,7 +33,7 @@
typedef char trgm[3];
#define CMPCHAR(a,b) ( ((a)==(b)) ? 0 : ( ((a)<(b)) ? -1 : 1 ) )
#define CMPPCHAR(a,b,i) CMPCHAR( *(((char*)(a))+i), *(((char*)(b))+i) )
#define CMPPCHAR(a,b,i) CMPCHAR( *(((const char*)(a))+i), *(((const char*)(b))+i) )
#define CMPTRGM(a,b) ( CMPPCHAR(a,b,0) ? CMPPCHAR(a,b,0) : ( CMPPCHAR(a,b,1) ? CMPPCHAR(a,b,1) : CMPPCHAR(a,b,2) ) )
#define CPTRGM(a,b) do { \

4
contrib/pg_trgm/trgm_gist.c
View File

@ -594,10 +594,10 @@ typedef struct
static int
comparecost(const void *a, const void *b)
{
if (((SPLITCOST *) a)->cost == ((SPLITCOST *) b)->cost)
if (((const SPLITCOST *) a)->cost == ((const SPLITCOST *) b)->cost)
return 0;
else
return (((SPLITCOST *) a)->cost > ((SPLITCOST *) b)->cost) ? 1 : -1;
return (((const SPLITCOST *) a)->cost > ((const SPLITCOST *) b)->cost) ? 1 : -1;
}

6
contrib/pgcrypto/crypt-blowfish.c
View File

@ -371,7 +371,7 @@ BF_decode(BF_word *dst, const char *src, int size)
{
unsigned char *dptr = (unsigned char *) dst;
unsigned char *end = dptr + size;
unsigned char *sptr = (unsigned char *) src;
const unsigned char *sptr = (const unsigned char *) src;
unsigned int tmp,
c1,
c2,
@ -401,8 +401,8 @@ BF_decode(BF_word *dst, const char *src, int size)
static void
BF_encode(char *dst, const BF_word *src, int size)
{
unsigned char *sptr = (unsigned char *) src;
unsigned char *end = sptr + size;
const unsigned char *sptr = (const unsigned char *) src;
const unsigned char *end = sptr + size;
unsigned char *dptr = (unsigned char *) dst;
unsigned int c1,
c2;

4
contrib/pgcrypto/crypt-des.c
View File

@ -407,8 +407,8 @@ des_setkey(const char *key)
if (!des_initialised)
des_init();
rawkey0 = ntohl(*(uint32 *) key);
rawkey1 = ntohl(*(uint32 *) (key + 4));
rawkey0 = ntohl(*(const uint32 *) key);
rawkey1 = ntohl(*(const uint32 *) (key + 4));
if ((rawkey0 | rawkey1)
&& rawkey0 == old_rawkey0

6
contrib/pgcrypto/crypt-gensalt.c
View File

@ -123,8 +123,8 @@ static unsigned char BF_itoa64[64 + 1] =
static void
BF_encode(char *dst, const BF_word *src, int size)
{
unsigned char *sptr = (unsigned char *) src;
unsigned char *end = sptr + size;
const unsigned char *sptr = (const unsigned char *) src;
const unsigned char *end = sptr + size;
unsigned char *dptr = (unsigned char *) dst;
unsigned int c1,
c2;
@ -180,7 +180,7 @@ _crypt_gensalt_blowfish_rn(unsigned long count,
output[5] = '0' + count % 10;
output[6] = '$';
BF_encode(&output[7], (BF_word *) input, 16);
BF_encode(&output[7], (const BF_word *) input, 16);
output[7 + 22] = '\0';
return output;

20
contrib/pgcrypto/crypt-md5.c
View File

@ -72,18 +72,18 @@ px_crypt_md5(const char *pw, const char *salt, char *passwd, unsigned dstlen)
err = px_find_digest("md5", &ctx1);
/* The password first, since that is what is most unknown */
px_md_update(ctx, (uint8 *) pw, strlen(pw));
px_md_update(ctx, (const uint8 *) pw, strlen(pw));
/* Then our magic string */
px_md_update(ctx, (uint8 *) magic, strlen(magic));
/* Then the raw salt */
px_md_update(ctx, (uint8 *) sp, sl);
px_md_update(ctx, (const uint8 *) sp, sl);
/* Then just as many characters of the MD5(pw,salt,pw) */
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
px_md_update(ctx1, (uint8 *) sp, sl);
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
px_md_update(ctx1, (const uint8 *) pw, strlen(pw));
px_md_update(ctx1, (const uint8 *) sp, sl);
px_md_update(ctx1, (const uint8 *) pw, strlen(pw));
px_md_finish(ctx1, final);
for (pl = strlen(pw); pl > 0; pl -= MD5_SIZE)
px_md_update(ctx, final, pl > MD5_SIZE ? MD5_SIZE : pl);
@ -96,7 +96,7 @@ px_crypt_md5(const char *pw, const char *salt, char *passwd, unsigned dstlen)
if (i & 1)
px_md_update(ctx, final, 1);
else
px_md_update(ctx, (uint8 *) pw, 1);
px_md_update(ctx, (const uint8 *) pw, 1);
/* Now make the output string */
strcpy(passwd, magic);
@ -114,20 +114,20 @@ px_crypt_md5(const char *pw, const char *salt, char *passwd, unsigned dstlen)
{
px_md_reset(ctx1);
if (i & 1)
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
px_md_update(ctx1, (const uint8 *) pw, strlen(pw));
else
px_md_update(ctx1, final, MD5_SIZE);
if (i % 3)
px_md_update(ctx1, (uint8 *) sp, sl);
px_md_update(ctx1, (const uint8 *) sp, sl);
if (i % 7)
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
px_md_update(ctx1, (const uint8 *) pw, strlen(pw));
if (i & 1)
px_md_update(ctx1, final, MD5_SIZE);
else
px_md_update(ctx1, (uint8 *) pw, strlen(pw));
px_md_update(ctx1, (const uint8 *) pw, strlen(pw));
px_md_finish(ctx1, final);
}

16
src/backend/commands/analyze.c
View File

@ -1362,8 +1362,8 @@ get_next_S(double t, int n, double *stateptr)
static int
compare_rows(const void *a, const void *b)
{
HeapTuple ha = *(HeapTuple *) a;
HeapTuple hb = *(HeapTuple *) b;
HeapTuple ha = *(const HeapTuple *) a;
HeapTuple hb = *(const HeapTuple *) b;
BlockNumber ba = ItemPointerGetBlockNumber(&ha->t_self);
OffsetNumber oa = ItemPointerGetOffsetNumber(&ha->t_self);
BlockNumber bb = ItemPointerGetBlockNumber(&hb->t_self);
@ -2700,10 +2700,10 @@ compute_scalar_stats(VacAttrStatsP stats,
static int
compare_scalars(const void *a, const void *b, void *arg)
{
Datum da = ((ScalarItem *) a)->value;
int ta = ((ScalarItem *) a)->tupno;
Datum db = ((ScalarItem *) b)->value;
int tb = ((ScalarItem *) b)->tupno;
Datum da = ((const ScalarItem *) a)->value;
int ta = ((const ScalarItem *) a)->tupno;
Datum db = ((const ScalarItem *) b)->value;
int tb = ((const ScalarItem *) b)->tupno;
CompareScalarsContext *cxt = (CompareScalarsContext *) arg;
int32 compare;
@ -2734,8 +2734,8 @@ compare_scalars(const void *a, const void *b, void *arg)
static int
compare_mcvs(const void *a, const void *b)
{
int da = ((ScalarMCVItem *) a)->first;
int db = ((ScalarMCVItem *) b)->first;
int da = ((const ScalarMCVItem *) a)->first;
int db = ((const ScalarMCVItem *) b)->first;
return da - db;
}

8
src/backend/commands/copy.c
View File

@ -296,7 +296,7 @@ static char *limit_printout_length(const char *str);
static void SendCopyBegin(CopyState cstate);
static void ReceiveCopyBegin(CopyState cstate);
static void SendCopyEnd(CopyState cstate);
static void CopySendData(CopyState cstate, void *databuf, int datasize);
static void CopySendData(CopyState cstate, const void *databuf, int datasize);
static void CopySendString(CopyState cstate, const char *str);
static void CopySendChar(CopyState cstate, char c);
static void CopySendEndOfRow(CopyState cstate);
@ -431,9 +431,9 @@ SendCopyEnd(CopyState cstate)
*----------
*/
static void
CopySendData(CopyState cstate, void *databuf, int datasize)
CopySendData(CopyState cstate, const void *databuf, int datasize)
{
appendBinaryStringInfo(cstate->fe_msgbuf, (char *) databuf, datasize);
appendBinaryStringInfo(cstate->fe_msgbuf, databuf, datasize);
}
static void
@ -1535,7 +1535,7 @@ CopyTo(CopyState cstate)
int32 tmp;
/* Signature */
CopySendData(cstate, (char *) BinarySignature, 11);
CopySendData(cstate, BinarySignature, 11);
/* Flags field */
tmp = 0;
if (cstate->oids)

12
src/backend/libpq/ip.c
View File

@ -283,14 +283,14 @@ pg_range_sockaddr(const struct sockaddr_storage * addr,
const struct sockaddr_storage * netmask)
{
if (addr->ss_family == AF_INET)
return range_sockaddr_AF_INET((struct sockaddr_in *) addr,
(struct sockaddr_in *) netaddr,
(struct sockaddr_in *) netmask);
return range_sockaddr_AF_INET((const struct sockaddr_in *) addr,
(const struct sockaddr_in *) netaddr,
(const struct sockaddr_in *) netmask);
#ifdef HAVE_IPV6
else if (addr->ss_family == AF_INET6)
return range_sockaddr_AF_INET6((struct sockaddr_in6 *) addr,
(struct sockaddr_in6 *) netaddr,
(struct sockaddr_in6 *) netmask);
return range_sockaddr_AF_INET6((const struct sockaddr_in6 *) addr,
(const struct sockaddr_in6 *) netaddr,
(const struct sockaddr_in6 *) netmask);
#endif
else
return 0;

8
src/backend/libpq/md5.c
View File

@ -33,7 +33,7 @@
* when it is no longer needed.
*/
static uint8 *
createPaddedCopyWithLength(uint8 *b, uint32 *l)
createPaddedCopyWithLength(const uint8 *b, uint32 *l)
{
uint8 *ret;
uint32 q;
@ -182,7 +182,7 @@ doTheRounds(uint32 X[16], uint32 state[4])
}
static int
calculateDigestFromBuffer(uint8 *b, uint32 len, uint8 sum[16])
calculateDigestFromBuffer(const uint8 *b, uint32 len, uint8 sum[16])
{
register uint32 i,
j,
@ -291,7 +291,7 @@ pg_md5_hash(const void *buff, size_t len, char *hexsum)
{
uint8 sum[16];
if (!calculateDigestFromBuffer((uint8 *) buff, len, sum))
if (!calculateDigestFromBuffer(buff, len, sum))
return false;
bytesToHex(sum, hexsum);
@ -301,7 +301,7 @@ pg_md5_hash(const void *buff, size_t len, char *hexsum)
bool
pg_md5_binary(const void *buff, size_t len, void *outbuf)
{
if (!calculateDigestFromBuffer((uint8 *) buff, len, outbuf))
if (!calculateDigestFromBuffer(buff, len, outbuf))
return false;
return true;
}

2
src/backend/nodes/makefuncs.c
View File

@ -45,7 +45,7 @@ makeA_Expr(A_Expr_Kind kind, List *name,
* As above, given a simple (unqualified) operator name
*/
A_Expr *
makeSimpleA_Expr(A_Expr_Kind kind, const char *name,
makeSimpleA_Expr(A_Expr_Kind kind, char *name,
Node *lexpr, Node *rexpr, int location)
{
A_Expr *a = makeNode(A_Expr);

4
src/backend/nodes/tidbitmap.c
View File

@ -1011,8 +1011,8 @@ tbm_lossify(TIDBitmap *tbm)
static int
tbm_comparator(const void *left, const void *right)
{
BlockNumber l = (*((const PagetableEntry **) left))->blockno;
BlockNumber r = (*((const PagetableEntry **) right))->blockno;
BlockNumber l = (*((PagetableEntry * const *) left))->blockno;
BlockNumber r = (*((PagetableEntry * const *) right))->blockno;
if (l < r)
return -1;

4
src/backend/postmaster/autovacuum.c
View File

@ -1028,10 +1028,10 @@ rebuild_database_list(Oid newdb)
static int
db_comparator(const void *a, const void *b)
{
if (((avl_dbase *) a)->adl_score == ((avl_dbase *) b)->adl_score)
if (((const avl_dbase *) a)->adl_score == ((const avl_dbase *) b)->adl_score)
return 0;
else
return (((avl_dbase *) a)->adl_score < ((avl_dbase *) b)->adl_score) ? 1 : -1;
return (((const avl_dbase *) a)->adl_score < ((const avl_dbase *) b)->adl_score) ? 1 : -1;
}
/*

6
src/backend/storage/lmgr/lock.c
View File

@ -937,7 +937,7 @@ SetupLockInTable(LockMethod lockMethodTable, PGPROC *proc,
* anytime.
*/
lock = (LOCK *) hash_search_with_hash_value(LockMethodLockHash,
(void *) locktag,
(const void *) locktag,
hashcode,
HASH_ENTER_NULL,
&found);
@ -1673,7 +1673,7 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock)
Assert(FastPathTag(locktag) && FastPathWeakMode(lockmode));
lock = (LOCK *) hash_search_with_hash_value(LockMethodLockHash,
(void *) locktag,
(const void *) locktag,
locallock->hashcode,
HASH_FIND,
&found);
@ -2505,7 +2505,7 @@ GetLockConflicts(const LOCKTAG *locktag, LOCKMODE lockmode)
LWLockAcquire(partitionLock, LW_SHARED);
lock = (LOCK *) hash_search_with_hash_value(LockMethodLockHash,
(void *) locktag,
(const void *) locktag,
hashcode,
HASH_FIND,
NULL);

2
src/backend/tsearch/dict_synonym.c
View File

@ -83,7 +83,7 @@ findwrd(char *in, char **end, uint16 *flags)
static int
compareSyn(const void *a, const void *b)
{
return strcmp(((Syn *) a)->in, ((Syn *) b)->in);
return strcmp(((const Syn *) a)->in, ((const Syn *) b)->in);
}

8
src/backend/tsearch/dict_thesaurus.c
View File

@ -348,7 +348,7 @@ cmpLexemeInfo(LexemeInfo *a, LexemeInfo *b)
}
static int
cmpLexeme(TheLexeme *a, TheLexeme *b)
cmpLexeme(const TheLexeme *a, const TheLexeme *b)
{
if (a->lexeme == NULL)
{
@ -366,14 +366,14 @@ cmpLexeme(TheLexeme *a, TheLexeme *b)
static int
cmpLexemeQ(const void *a, const void *b)
{
return cmpLexeme((TheLexeme *) a, (TheLexeme *) b);
return cmpLexeme((const TheLexeme *) a, (const TheLexeme *) b);
}
static int
cmpTheLexeme(const void *a, const void *b)
{
TheLexeme *la = (TheLexeme *) a;
TheLexeme *lb = (TheLexeme *) b;
const TheLexeme *la = (const TheLexeme *) a;
const TheLexeme *lb = (const TheLexeme *) b;
int res;
if ((res = cmpLexeme(la, lb)) != 0)

8
src/backend/tsearch/spell.c
View File

@ -140,7 +140,7 @@ lowerstr_ctx(IspellDict *Conf, const char *src)
#define MAXNORMLEN 256
#define STRNCMP(s,p) strncmp( (s), (p), strlen(p) )
#define GETWCHAR(W,L,N,T) ( ((uint8*)(W))[ ((T)==FF_PREFIX) ? (N) : ( (L) - 1 - (N) ) ] )
#define GETWCHAR(W,L,N,T) ( ((const uint8*)(W))[ ((T)==FF_PREFIX) ? (N) : ( (L) - 1 - (N) ) ] )
#define GETCHAR(A,N,T) GETWCHAR( (A)->repl, (A)->replen, N, T )
static char *VoidString = "";
@ -148,12 +148,12 @@ static char *VoidString = "";
static int
cmpspell(const void *s1, const void *s2)
{
return (strcmp((*(const SPELL **) s1)->word, (*(const SPELL **) s2)->word));
return (strcmp((*(SPELL * const *) s1)->word, (*(SPELL * const *) s2)->word));
}
static int
cmpspellaffix(const void *s1, const void *s2)
{
return (strncmp((*(const SPELL **) s1)->p.flag, (*(const SPELL **) s2)->p.flag, MAXFLAGLEN));
return (strncmp((*(SPELL * const *) s1)->p.flag, (*(SPELL * const *) s2)->p.flag, MAXFLAGLEN));
}
static char *
@ -332,7 +332,7 @@ FindWord(IspellDict *Conf, const char *word, int affixflag, int flag)
SPNodeData *StopLow,
*StopHigh,
*StopMiddle;
uint8 *ptr = (uint8 *) word;
const uint8 *ptr = (const uint8 *) word;
flag &= FF_DICTFLAGMASK;

8
src/backend/tsearch/to_tsany.c
View File

@ -33,16 +33,16 @@ compareWORD(const void *a, const void *b)
int res;
res = tsCompareString(
((ParsedWord *) a)->word, ((ParsedWord *) a)->len,
((ParsedWord *) b)->word, ((ParsedWord *) b)->len,
((const ParsedWord *) a)->word, ((const ParsedWord *) a)->len,
((const ParsedWord *) b)->word, ((const ParsedWord *) b)->len,
false);
if (res == 0)
{
if (((ParsedWord *) a)->pos.pos == ((ParsedWord *) b)->pos.pos)
if (((const ParsedWord *) a)->pos.pos == ((const ParsedWord *) b)->pos.pos)
return 0;
res = (((ParsedWord *) a)->pos.pos > ((ParsedWord *) b)->pos.pos) ? 1 : -1;
res = (((const ParsedWord *) a)->pos.pos > ((const ParsedWord *) b)->pos.pos) ? 1 : -1;
}
return res;

2
src/backend/tsearch/ts_utils.c
View File

@ -62,7 +62,7 @@ get_tsearch_config_filename(const char *basename,
static int
comparestr(const void *a, const void *b)
{
return strcmp(*(char **) a, *(char **) b);
return strcmp(*(char * const *) a, *(char * const *) b);
}
/*

8
src/backend/utils/adt/tsgistidx.c
View File

@ -131,8 +131,8 @@ gtsvectorout(PG_FUNCTION_ARGS)
static int
compareint(const void *va, const void *vb)
{
int4 a = *((int4 *) va);
int4 b = *((int4 *) vb);
int4 a = *((const int4 *) va);
int4 b = *((const int4 *) vb);
if (a == b)
return 0;
@ -593,8 +593,8 @@ typedef struct
static int
comparecost(const void *va, const void *vb)
{
SPLITCOST *a = (SPLITCOST *) va;
SPLITCOST *b = (SPLITCOST *) vb;
const SPLITCOST *a = (const SPLITCOST *) va;
const SPLITCOST *b = (const SPLITCOST *) vb;
if (a->cost == b->cost)
return 0;

4
src/backend/utils/adt/tsquery_gist.c
View File

@ -156,10 +156,10 @@ typedef struct
static int
comparecost(const void *a, const void *b)
{
if (((SPLITCOST *) a)->cost == ((SPLITCOST *) b)->cost)
if (((const SPLITCOST *) a)->cost == ((const SPLITCOST *) b)->cost)
return 0;
else
return (((SPLITCOST *) a)->cost > ((SPLITCOST *) b)->cost) ? 1 : -1;
return (((const SPLITCOST *) a)->cost > ((const SPLITCOST *) b)->cost) ? 1 : -1;
}
#define WISH_F(a,b,c) (double)( -(double)(((a)-(b))*((a)-(b))*((a)-(b)))*(c) )

8
src/backend/utils/adt/tsrank.c
View File

@ -134,8 +134,8 @@ static int
compareQueryOperand(const void *a, const void *b, void *arg)
{
char *operand = (char *) arg;
QueryOperand *qa = (*(QueryOperand **) a);
QueryOperand *qb = (*(QueryOperand **) b);
QueryOperand *qa = (*(QueryOperand * const *) a);
QueryOperand *qb = (*(QueryOperand * const *) b);
return tsCompareString(operand + qa->distance, qa->length,
operand + qb->distance, qb->length,
@ -498,8 +498,8 @@ typedef struct
static int
compareDocR(const void *va, const void *vb)
{
DocRepresentation *a = (DocRepresentation *) va;
DocRepresentation *b = (DocRepresentation *) vb;
const DocRepresentation *a = (const DocRepresentation *) va;
const DocRepresentation *b = (const DocRepresentation *) vb;
if (a->pos == b->pos)
return 0;

4
src/backend/utils/adt/xml.c
View File

@ -396,7 +396,7 @@ cstring_to_xmltype(const char *string)
static xmltype *
xmlBuffer_to_xmltype(xmlBufferPtr buf)
{
return (xmltype *) cstring_to_text_with_len((char *) xmlBufferContent(buf),
return (xmltype *) cstring_to_text_with_len((const char *) xmlBufferContent(buf),
xmlBufferLength(buf));
}
#endif
@ -1267,7 +1267,7 @@ static bool
print_xml_decl(StringInfo buf, const xmlChar *version,
pg_enc encoding, int standalone)
{
if ((version && strcmp((char *) version, PG_XML_DEFAULT_VERSION) != 0)
if ((version && strcmp((const char *) version, PG_XML_DEFAULT_VERSION) != 0)
|| (encoding && encoding != PG_UTF8)
|| standalone != -1)
{

20
src/backend/utils/mb/conv.c
View File

@ -247,8 +247,8 @@ compare1(const void *p1, const void *p2)
uint32 v1,
v2;
v1 = *(uint32 *) p1;
v2 = ((pg_utf_to_local *) p2)->utf;
v1 = *(const uint32 *) p1;
v2 = ((const pg_utf_to_local *) p2)->utf;
return (v1 > v2) ? 1 : ((v1 == v2) ? 0 : -1);
}
@ -262,8 +262,8 @@ compare2(const void *p1, const void *p2)
uint32 v1,
v2;
v1 = *(uint32 *) p1;
v2 = ((pg_local_to_utf *) p2)->code;
v1 = *(const uint32 *) p1;
v2 = ((const pg_local_to_utf *) p2)->code;
return (v1 > v2) ? 1 : ((v1 == v2) ? 0 : -1);
}
@ -279,10 +279,10 @@ compare3(const void *p1, const void *p2)
d1,
d2;
s1 = *(uint32 *) p1;
s2 = *((uint32 *) p1 + 1);
d1 = ((pg_utf_to_local_combined *) p2)->utf1;
d2 = ((pg_utf_to_local_combined *) p2)->utf2;
s1 = *(const uint32 *) p1;
s2 = *((const uint32 *) p1 + 1);
d1 = ((const pg_utf_to_local_combined *) p2)->utf1;
d2 = ((const pg_utf_to_local_combined *) p2)->utf2;
return (s1 > d1 || (s1 == d1 && s2 > d2)) ? 1 : ((s1 == d1 && s2 == d2) ? 0 : -1);
}
@ -296,8 +296,8 @@ compare4(const void *p1, const void *p2)
uint32 v1,
v2;
v1 = *(uint32 *) p1;
v2 = ((pg_local_to_utf_combined *) p2)->code;
v1 = *(const uint32 *) p1;
v2 = ((const pg_local_to_utf_combined *) p2)->code;
return (v1 > v2) ? 1 : ((v1 == v2) ? 0 : -1);
}

4
src/bin/pg_dump/common.c
View File

@ -650,8 +650,8 @@ buildIndexArray(void *objArray, int numObjs, Size objSize)
static int
DOCatalogIdCompare(const void *p1, const void *p2)
{
DumpableObject *obj1 = *(DumpableObject **) p1;
DumpableObject *obj2 = *(DumpableObject **) p2;
const DumpableObject *obj1 = *(DumpableObject * const *) p1;
const DumpableObject *obj2 = *(DumpableObject * const *) p2;
int cmpval;
/*

4
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -1393,7 +1393,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
}
else if (AH->gzOut)
{
res = GZWRITE((void *) ptr, size, nmemb, AH->OF);
res = GZWRITE(ptr, size, nmemb, AH->OF);
if (res != (nmemb * size))
die_horribly(AH, modulename, "could not write to output file: %s\n", strerror(errno));
return res;
@ -1416,7 +1416,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
return ExecuteSqlCommandBuf(AH, (const char *) ptr, size * nmemb);
else
{
res = fwrite((void *) ptr, size, nmemb, AH->OF);
res = fwrite(ptr, size, nmemb, AH->OF);
if (res != nmemb)
die_horribly(AH, modulename, "could not write to output file: %s\n",
strerror(errno));

2
src/bin/pg_dump/pg_backup_files.c
View File

@ -268,7 +268,7 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen)
{
lclTocEntry *tctx = (lclTocEntry *) AH->currToc->formatData;
GZWRITE((void *) data, 1, dLen, tctx->FH);
GZWRITE(data, 1, dLen, tctx->FH);
return dLen;
}

6
src/bin/pg_dump/pg_backup_tar.c
View File

@ -581,7 +581,7 @@ tarWrite(const void *buf, size_t len, TAR_MEMBER *th)
size_t res;
if (th->zFH != NULL)
res = GZWRITE((void *) buf, 1, len, th->zFH);
res = GZWRITE(buf, 1, len, th->zFH);
else
res = fwrite(buf, 1, len, th->nFH);
@ -598,7 +598,7 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen)
{
lclTocEntry *tctx = (lclTocEntry *) AH->currToc->formatData;
dLen = tarWrite((void *) data, dLen, tctx->TH);
dLen = tarWrite(data, dLen, tctx->TH);
return dLen;
}
@ -797,7 +797,7 @@ _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len)
lclContext *ctx = (lclContext *) AH->formatData;
size_t res;
res = tarWrite((void *) buf, len, ctx->FH);
res = tarWrite(buf, len, ctx->FH);
ctx->filePos += res;
return res;
}

12
src/bin/pg_dump/pg_dump_sort.c
View File

@ -138,8 +138,8 @@ sortDumpableObjectsByTypeName(DumpableObject **objs, int numObjs)
static int
DOTypeNameCompare(const void *p1, const void *p2)
{
DumpableObject *obj1 = *(DumpableObject **) p1;
DumpableObject *obj2 = *(DumpableObject **) p2;
DumpableObject *obj1 = *(DumpableObject * const *) p1;
DumpableObject *obj2 = *(DumpableObject * const *) p2;
int cmpval;
/* Sort by type */
@ -170,8 +170,8 @@ DOTypeNameCompare(const void *p1, const void *p2)
/* To have a stable sort order, break ties for some object types */
if (obj1->objType == DO_FUNC || obj1->objType == DO_AGG)
{
FuncInfo *fobj1 = *(FuncInfo **) p1;
FuncInfo *fobj2 = *(FuncInfo **) p2;
FuncInfo *fobj1 = *(FuncInfo * const *) p1;
FuncInfo *fobj2 = *(FuncInfo * const *) p2;
cmpval = fobj1->nargs - fobj2->nargs;
if (cmpval != 0)
@ -200,8 +200,8 @@ sortDumpableObjectsByTypeOid(DumpableObject **objs, int numObjs)
static int
DOTypeOidCompare(const void *p1, const void *p2)
{
DumpableObject *obj1 = *(DumpableObject **) p1;
DumpableObject *obj2 = *(DumpableObject **) p2;
DumpableObject *obj1 = *(DumpableObject * const *) p1;
DumpableObject *obj2 = *(DumpableObject * const *) p2;
int cmpval;
cmpval = oldObjectTypePriority[obj1->objType] -

4
src/bin/psql/mbprint.c
View File

@ -205,7 +205,7 @@ pg_wcswidth(const unsigned char *pwcs, size_t len, int encoding)
* This MUST be kept in sync with pg_wcsformat!
*/
void
pg_wcssize(unsigned char *pwcs, size_t len, int encoding,
pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,
int *result_width, int *result_height, int *result_format_size)
{
int w,
@ -288,7 +288,7 @@ pg_wcssize(unsigned char *pwcs, size_t len, int encoding,
* This MUST be kept in sync with pg_wcssize!
*/
void
pg_wcsformat(unsigned char *pwcs, size_t len, int encoding,
pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding,
struct lineptr * lines, int count)
{
int w,

4
src/bin/psql/mbprint.h
View File

@ -11,8 +11,8 @@ struct lineptr
extern unsigned char *mbvalidate(unsigned char *pwcs, int encoding);
extern int pg_wcswidth(const unsigned char *pwcs, size_t len, int encoding);
extern void pg_wcsformat(unsigned char *pwcs, size_t len, int encoding, struct lineptr * lines, int count);
extern void pg_wcssize(unsigned char *pwcs, size_t len, int encoding,
extern void pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding, struct lineptr * lines, int count);
extern void pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,
int *width, int *height, int *format_size);
#endif /* MBPRINT_H */

20
src/bin/psql/print.c
View File

@ -559,7 +559,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
nl_lines,
bytes_required;
pg_wcssize((unsigned char *) cont->headers[i], strlen(cont->headers[i]),
pg_wcssize((const unsigned char *) cont->headers[i], strlen(cont->headers[i]),
encoding, &width, &nl_lines, &bytes_required);
if (width > max_width[i])
max_width[i] = width;
@ -583,7 +583,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
nl_lines,
bytes_required;
pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding,
pg_wcssize((const unsigned char *) *ptr, strlen(*ptr), encoding,
&width, &nl_lines, &bytes_required);
if (width > max_width[i % col_count])
@ -731,7 +731,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
nl_lines,
bytes_required;
pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding,
pg_wcssize((const unsigned char *) *ptr, strlen(*ptr), encoding,
&width, &nl_lines, &bytes_required);
/*
@ -768,7 +768,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
int width,
height;
pg_wcssize((unsigned char *) cont->title, strlen(cont->title),
pg_wcssize((const unsigned char *) cont->title, strlen(cont->title),
encoding, &width, &height, NULL);
if (width >= width_total)
/* Aligned */
@ -790,7 +790,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
PRINT_RULE_TOP, format, fout);
for (i = 0; i < col_count; i++)
pg_wcsformat((unsigned char *) cont->headers[i],
pg_wcsformat((const unsigned char *) cont->headers[i],
strlen(cont->headers[i]), encoding,
col_lineptrs[i], max_nl_lines[i]);
@ -861,7 +861,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout)
*/
for (j = 0; j < col_count; j++)
{
pg_wcsformat((unsigned char *) ptr[j], strlen(ptr[j]), encoding,
pg_wcsformat((const unsigned char *) ptr[j], strlen(ptr[j]), encoding,
col_lineptrs[j], max_nl_lines[j]);
curr_nl_line[j] = 0;
}
@ -1146,7 +1146,7 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout)
height,
fs;
pg_wcssize((unsigned char *) cont->headers[i], strlen(cont->headers[i]),
pg_wcssize((const unsigned char *) cont->headers[i], strlen(cont->headers[i]),
encoding, &width, &height, &fs);
if (width > hwidth)
hwidth = width;
@ -1163,7 +1163,7 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout)
height,
fs;
pg_wcssize((unsigned char *) *ptr, strlen(*ptr), encoding,
pg_wcssize((const unsigned char *) *ptr, strlen(*ptr), encoding,
&width, &height, &fs);
if (width > dwidth)
dwidth = width;
@ -1219,11 +1219,11 @@ print_aligned_vertical(const printTableContent *cont, FILE *fout)
}
/* Format the header */
pg_wcsformat((unsigned char *) cont->headers[i % cont->ncolumns],
pg_wcsformat((const unsigned char *) cont->headers[i % cont->ncolumns],
strlen(cont->headers[i % cont->ncolumns]),
encoding, hlineptr, hheight);
/* Format the data */
pg_wcsformat((unsigned char *) *ptr, strlen(*ptr), encoding,
pg_wcsformat((const unsigned char *) *ptr, strlen(*ptr), encoding,
dlineptr, dheight);
line_count = 0;

2
src/include/nodes/makefuncs.h
View File

@ -20,7 +20,7 @@
extern A_Expr *makeA_Expr(A_Expr_Kind kind, List *name,
Node *lexpr, Node *rexpr, int location);
extern A_Expr *makeSimpleA_Expr(A_Expr_Kind kind, const char *name,
extern A_Expr *makeSimpleA_Expr(A_Expr_Kind kind, char *name,
Node *lexpr, Node *rexpr, int location);
extern Var *makeVar(Index varno,

20
src/interfaces/ecpg/ecpglib/descriptor.c
View File

@ -155,36 +155,36 @@ set_int_item(int lineno, int *target, const void *var, enum ECPGttype vartype)
switch (vartype)
{
case ECPGt_short:
*target = *(short *) var;
*target = *(const short *) var;
break;
case ECPGt_int:
*target = *(int *) var;
*target = *(const int *) var;
break;
case ECPGt_long:
*target = *(long *) var;
*target = *(const long *) var;
break;
case ECPGt_unsigned_short:
*target = *(unsigned short *) var;
*target = *(const unsigned short *) var;
break;
case ECPGt_unsigned_int:
*target = *(unsigned int *) var;
*target = *(const unsigned int *) var;
break;
case ECPGt_unsigned_long:
*target = *(unsigned long *) var;
*target = *(const unsigned long *) var;
break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long:
*target = *(long long int *) var;
*target = *(const long long int *) var;
break;
case ECPGt_unsigned_long_long:
*target = *(unsigned long long int *) var;
*target = *(const unsigned long long int *) var;
break;
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_float:
*target = *(float *) var;
*target = *(const float *) var;
break;
case ECPGt_double:
*target = *(double *) var;
*target = *(const double *) var;
break;
default:
ecpg_raise(lineno, ECPG_VAR_NOT_NUMERIC, ECPG_SQLSTATE_RESTRICTED_DATA_TYPE_ATTRIBUTE_VIOLATION, NULL);

4
src/interfaces/ecpg/ecpglib/execute.c
View File

@ -1074,7 +1074,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
default:
/* Not implemented yet */
ecpg_raise(lineno, ECPG_UNSUPPORTED, ECPG_SQLSTATE_ECPG_INTERNAL_ERROR, (char *) ecpg_type_name(var->type));
ecpg_raise(lineno, ECPG_UNSUPPORTED, ECPG_SQLSTATE_ECPG_INTERNAL_ERROR, ecpg_type_name(var->type));
return false;
break;
}
@ -1940,7 +1940,7 @@ bool
ECPGdo_descriptor(int line, const char *connection,
const char *descriptor, const char *query)
{
return ECPGdo(line, ECPG_COMPAT_PGSQL, true, connection, '\0', 0, (char *) query, ECPGt_EOIT,
return ECPGdo(line, ECPG_COMPAT_PGSQL, true, connection, '\0', 0, query, ECPGt_EOIT,
ECPGt_descriptor, descriptor, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL, 0L, 0L, 0L, ECPGt_EORT);
}