Add const qualifiers where they are accidentally cast away

This only produces warnings under -Wcast-qual, but it's more correct
and consistent in any case.

diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index eb8f2826349a7e9ec0546a926d1e26753aa454c8..c6b00eaeff0da5550b0b6a88da3b49ac1f3926e5 100644 (file)
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -332,7 +332,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;
 }
 
 

diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 1c0fa88c3af446afd489f4918fa89d9ec2d1c98a..13d96656d2e146d05855133e3ea7198234f2e23e 100644 (file)
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -275,8 +275,8 @@ static int
 treekey_cmp(const void *a, const void *b)
 {
        return ltree_compare(
-                                                ((RIX *) a)->r,
-                                                ((RIX *) b)->r
+                                                ((const RIX *) a)->r,
+                                                ((const RIX *) b)->r
                );
 }
 

diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c
index 41b84112961f52222943eb51fbcf62f9e7bf51a9..7070890f20f296e1dcd23d9b6b98ce2a904805d0 100644 (file)
--- a/src/backend/access/gist/gistproc.c
+++ b/src/backend/access/gist/gistproc.c
@@ -284,8 +284,8 @@ typedef struct
 static int
 interval_cmp_lower(const void *i1, const void *i2)
 {
-       double          lower1 = ((SplitInterval *) i1)->lower,
-                               lower2 = ((SplitInterval *) i2)->lower;
+       double          lower1 = ((const SplitInterval *) i1)->lower,
+                               lower2 = ((const SplitInterval *) i2)->lower;
 
        if (lower1 < lower2)
                return -1;
@@ -301,8 +301,8 @@ interval_cmp_lower(const void *i1, const void *i2)
 static int
 interval_cmp_upper(const void *i1, const void *i2)
 {
-       double          upper1 = ((SplitInterval *) i1)->upper,
-                               upper2 = ((SplitInterval *) i2)->upper;
+       double          upper1 = ((const SplitInterval *) i1)->upper,
+                               upper2 = ((const SplitInterval *) i2)->upper;
 
        if (upper1 < upper2)
                return -1;
@@ -455,8 +455,8 @@ box_penalty(BOX *original, BOX *new)
 static int
 common_entry_cmp(const void *i1, const void *i2)
 {
-       double          delta1 = ((CommonEntry *) i1)->delta,
-                               delta2 = ((CommonEntry *) i2)->delta;
+       double          delta1 = ((const CommonEntry *) i1)->delta,
+                               delta2 = ((const CommonEntry *) i2)->delta;
 
        if (delta1 < delta2)
                return -1;

diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index 946caa50db473858af6086b5fb574952a91aebc7..ae00f180b5dfc3751b19931174ccb858773c8b45 100644 (file)
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -134,7 +134,7 @@ QTNodeCompare(QTNode *an, QTNode *bn)
 static int
 cmpQTN(const void *a, const void *b)
 {
-       return QTNodeCompare(*(QTNode **) a, *(QTNode **) b);
+       return QTNodeCompare(*(QTNode * const *) a, *(QTNode * const *) b);
 }
 
 void

diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index c0ca3f8cec4ae40896bc29b166501e52ddcfd858..d7b637c1c437c51ad5f802b85779999464bd994c 100644 (file)
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -311,7 +311,7 @@ xml_recv(PG_FUNCTION_ARGS)
        str = VARDATA(result);
        str[nbytes] = '\0';
 
-       parse_xml_decl((xmlChar *) str, NULL, NULL, &encodingStr, NULL);
+       parse_xml_decl((const xmlChar *) str, NULL, NULL, &encodingStr, NULL);
 
        /*
         * If encoding wasn't explicitly specified in the XML header, treat it as

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index a5becbe8ff775124809c95ebc832b1508392071f..486bdcddef899919928827b42b1dbee8c314c35b 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -3780,8 +3780,8 @@ find_option(const char *name, bool create_placeholders, int elevel)
 static int
 guc_var_compare(const void *a, const void *b)
 {
-       struct config_generic *confa = *(struct config_generic **) a;
-       struct config_generic *confb = *(struct config_generic **) b;
+       const struct config_generic *confa = *(struct config_generic * const *) a;
+       const struct config_generic *confb = *(struct config_generic * const *) b;
 
        return guc_name_compare(confa->name, confb->name);
 }

diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c
index 2904b39b965f778e34b76f16d2f4adaee9c0a705..32fc756efe5d17acbb3a1e9506df28f169f82299 100644 (file)
--- a/src/bin/psql/mbprint.c
+++ b/src/bin/psql/mbprint.c
@@ -217,10 +217,10 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,
 
        for (; *pwcs && len > 0; pwcs += chlen)
        {
-               chlen = PQmblen((char *) pwcs, encoding);
+               chlen = PQmblen((const char *) pwcs, encoding);
                if (len < (size_t) chlen)
                        break;
-               w = PQdsplen((char *) pwcs, encoding);
+               w = PQdsplen((const char *) pwcs, encoding);
 
                if (chlen == 1)                 /* single-byte char */
                {
@@ -298,10 +298,10 @@ pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding,
 
        for (; *pwcs && len > 0; pwcs += chlen)
        {
-               chlen = PQmblen((char *) pwcs, encoding);
+               chlen = PQmblen((const char *) pwcs, encoding);
                if (len < (size_t) chlen)
                        break;
-               w = PQdsplen((char *) pwcs, encoding);
+               w = PQdsplen((const char *) pwcs, encoding);
 
                if (chlen == 1)                 /* single-byte char */
                {

diff --git a/src/include/c.h b/src/include/c.h
index 7396adbaa7780da37fa4f4427eaaafd330b5a876..82acd14a9b4709fcfca778521b21018ce96c33b4 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -478,7 +478,7 @@ typedef NameData *Name;
  * PointerIsValid
  *             True iff pointer is valid.
  */
-#define PointerIsValid(pointer) ((void*)(pointer) != NULL)
+#define PointerIsValid(pointer) ((const void*)(pointer) != NULL)
 
 /*
  * PointerIsAligned

diff --git a/src/include/utils/pg_crc.h b/src/include/utils/pg_crc.h
index d5273d0f96c3def80bf517c053b07973f611fd8a..0652c0ad3b8f9604395362b4425bed783c0da5db 100644 (file)
--- a/src/include/utils/pg_crc.h
+++ b/src/include/utils/pg_crc.h
@@ -40,7 +40,7 @@ typedef uint32 pg_crc32;
 /* Accumulate some (more) bytes into a CRC */
 #define COMP_CRC32(crc, data, len)     \
 do { \
-       unsigned char *__data = (unsigned char *) (data); \
+       const unsigned char *__data = (const unsigned char *) (data); \
        uint32          __len = (len); \
 \
        while (__len-- > 0) \