Add const qualifiers where they are accidentally cast away

petere · petere · commit 973e9fb294dc · 2012-02-28T12:42:08.000+02:00
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) \

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ typedef struct`
`332`	`332`	`static int`
`333`	`333`	`comparecost(const void a, const void b)`
`334`	`334`	`{`
`335`		`- return ((SPLITCOST ) a)->cost - ((SPLITCOST ) b)->cost;`
	`335`	`+ return ((const SPLITCOST ) a)->cost - ((const SPLITCOST ) b)->cost;`
`336`	`336`	`}`
`337`	`337`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -275,8 +275,8 @@ static int`
`275`	`275`	`treekey_cmp(const void a, const void b)`
`276`	`276`	`{`
`277`	`277`	`return ltree_compare(`
`278`		`- ((RIX *) a)->r,`
`279`		`- ((RIX *) b)->r`
	`278`	`+ ((const RIX *) a)->r,`
	`279`	`+ ((const RIX *) b)->r`
`280`	`280`	`);`
`281`	`281`	`}`
`282`	`282`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ QTNodeCompare(QTNode an, QTNode bn)`
`134`	`134`	`static int`
`135`	`135`	`cmpQTN(const void a, const void b)`
`136`	`136`	`{`
`137`		`- return QTNodeCompare((QTNode ) a, (QTNode **) b);`
	`137`	`+ return QTNodeCompare((QTNode const ) a, (QTNode * const *) b);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`void`
Original file line number	Diff line number	Diff line change
`@@ -3780,8 +3780,8 @@ find_option(const char *name, bool create_placeholders, int elevel)`
`3780`	`3780`	`static int`
`3781`	`3781`	`guc_var_compare(const void a, const void b)`
`3782`	`3782`	`{`
`3783`		`- struct config_generic confa = (struct config_generic **) a;`
`3784`		`- struct config_generic confb = (struct config_generic **) b;`
	`3783`	`+ const struct config_generic confa = (struct config_generic * const *) a;`
	`3784`	`+ const struct config_generic confb = (struct config_generic * const *) b;`
`3785`	`3785`
`3786`	`3786`	`return guc_name_compare(confa->name, confb->name);`
`3787`	`3787`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,10 +217,10 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding,`
`217`	`217`
`218`	`218`	`for (; *pwcs && len > 0; pwcs += chlen)`
`219`	`219`	`{`
`220`		`- chlen = PQmblen((char *) pwcs, encoding);`
	`220`	`+ chlen = PQmblen((const char *) pwcs, encoding);`
`221`	`221`	`if (len < (size_t) chlen)`
`222`	`222`	`break;`
`223`		`- w = PQdsplen((char *) pwcs, encoding);`
	`223`	`+ w = PQdsplen((const char *) pwcs, encoding);`
`224`	`224`
`225`	`225`	`if (chlen == 1) /* single-byte char */`
`226`	`226`	`{`
`@@ -298,10 +298,10 @@ pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding,`
`298`	`298`
`299`	`299`	`for (; *pwcs && len > 0; pwcs += chlen)`
`300`	`300`	`{`
`301`		`- chlen = PQmblen((char *) pwcs, encoding);`
	`301`	`+ chlen = PQmblen((const char *) pwcs, encoding);`
`302`	`302`	`if (len < (size_t) chlen)`
`303`	`303`	`break;`
`304`		`- w = PQdsplen((char *) pwcs, encoding);`
	`304`	`+ w = PQdsplen((const char *) pwcs, encoding);`
`305`	`305`
`306`	`306`	`if (chlen == 1) /* single-byte char */`
`307`	`307`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ typedef uint32 pg_crc32;`
`40`	`40`	`/* Accumulate some (more) bytes into a CRC */`
`41`	`41`	`#define COMP_CRC32(crc, data, len) \`
`42`	`42`	`do { \`
`43`		`- unsigned char __data = (unsigned char ) (data); \`
	`43`	`+ const unsigned char __data = (const unsigned char ) (data); \`
`44`	`44`	`uint32 __len = (len); \`
`45`	`45`	`\`
`46`	`46`	`while (__len-- > 0) \`