ecpg: Clean up some const usage

petere · petere · commit d41f510c807c · 2012-03-02T20:51:29.000+02:00
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1083,15 +1083,15 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
 }
 
 static void
-free_params(const char **paramValues, int nParams, bool print, int lineno)
+free_params(char **paramValues, int nParams, bool print, int lineno)
 {
 	int			n;
 
 	for (n = 0; n < nParams; n++)
 	{
 		if (print)
 			ecpg_log("free_params on line %d: parameter %d = %s\n", lineno, n + 1, paramValues[n] ? paramValues[n] : "null");
-		ecpg_free((void *) (paramValues[n]));
+		ecpg_free(paramValues[n]);
 	}
 	ecpg_free(paramValues);
 }
@@ -1138,7 +1138,7 @@ ecpg_execute(struct statement * stmt)
 	PGnotify   *notify;
 	struct variable *var;
 	int			desc_counter = 0;
-	const char **paramValues = NULL;
+	char	  **paramValues = NULL;
 	int			nParams = 0;
 	int			position = 0;
 	struct sqlca_t *sqlca = ECPGget_sqlca();
@@ -1380,7 +1380,7 @@ ecpg_execute(struct statement * stmt)
 		else
 		{
 			nParams++;
-			if (!(paramValues = (const char **) ecpg_realloc(paramValues, sizeof(const char *) * nParams, stmt->lineno)))
+			if (!(paramValues = (char **) ecpg_realloc(paramValues, sizeof(char *) * nParams, stmt->lineno)))
 			{
 				ecpg_free(paramValues);
 				return false;
@@ -1441,7 +1441,7 @@ ecpg_execute(struct statement * stmt)
 	ecpg_log("ecpg_execute on line %d: query: %s; with %d parameter(s) on connection %s\n", stmt->lineno, stmt->command, nParams, stmt->connection->name);
 	if (stmt->statement_type == ECPGst_execute)
 	{
-		results = PQexecPrepared(stmt->connection->connection, stmt->name, nParams, paramValues, NULL, NULL, 0);
+		results = PQexecPrepared(stmt->connection->connection, stmt->name, nParams, (const char *const*) paramValues, NULL, NULL, 0);
 		ecpg_log("ecpg_execute on line %d: using PQexecPrepared for \"%s\"\n", stmt->lineno, stmt->command);
 	}
 	else
@@ -1453,7 +1453,7 @@ ecpg_execute(struct statement * stmt)
 		}
 		else
 		{
-			results = PQexecParams(stmt->connection->connection, stmt->command, nParams, NULL, paramValues, NULL, NULL, 0);
+			results = PQexecParams(stmt->connection->connection, stmt->command, nParams, NULL, (const char *const*) paramValues, NULL, NULL, 0);
 			ecpg_log("ecpg_execute on line %d: using PQexecParams\n", stmt->lineno);
 		}
 	}
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -19,7 +19,7 @@ typedef struct
 	char		stmtID[STMTID_SIZE];
 	char	   *ecpgQuery;
 	long		execs;			/* # of executions		*/
-	char	   *connection;		/* connection for the statement		*/
+	const char *connection;		/* connection for the statement		*/
 } stmtCacheEntry;
 
 static int	nextStmtID = 1;
@@ -456,7 +456,7 @@ AddStmtToCache(int lineno,		/* line # of statement		*/
 	entry = &stmtCacheEntries[entNo];
 	entry->lineno = lineno;
 	entry->ecpgQuery = ecpg_strdup(ecpgQuery, lineno);
-	entry->connection = (char *) connection;
+	entry->connection = connection;
 	entry->execs = 0;
 	memcpy(entry->stmtID, stmtID, sizeof(entry->stmtID));
 
diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c
@@ -317,14 +317,14 @@ struct variable *
 descriptor_variable(const char *name, int input)
 {
 	static char descriptor_names[2][MAX_DESCRIPTOR_NAMELEN];
-	static const struct ECPGtype descriptor_type = {ECPGt_descriptor, NULL, NULL, NULL, {NULL}, 0};
-	static const struct variable varspace[2] = {
-		{descriptor_names[0], (struct ECPGtype *) & descriptor_type, 0, NULL},
-		{descriptor_names[1], (struct ECPGtype *) & descriptor_type, 0, NULL}
+	static struct ECPGtype descriptor_type = {ECPGt_descriptor, NULL, NULL, NULL, {NULL}, 0};
+	static struct variable varspace[2] = {
+		{descriptor_names[0], &descriptor_type, 0, NULL},
+		{descriptor_names[1], &descriptor_type, 0, NULL}
 	};
 
 	strlcpy(descriptor_names[input], name, sizeof(descriptor_names[input]));
-	return (struct variable *) & varspace[input];
+	return &varspace[input];
 }
 
 struct variable *

Original file line number	Diff line number	Diff line change
`@@ -1083,15 +1083,15 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari`
`1083`	`1083`	`}`
`1084`	`1084`
`1085`	`1085`	`static void`
`1086`		`-free_params(const char **paramValues, int nParams, bool print, int lineno)`
	`1086`	`+free_params(char **paramValues, int nParams, bool print, int lineno)`
`1087`	`1087`	`{`
`1088`	`1088`	`int n;`
`1089`	`1089`
`1090`	`1090`	`for (n = 0; n < nParams; n++)`
`1091`	`1091`	`{`
`1092`	`1092`	`if (print)`
`1093`	`1093`	`ecpg_log("free_params on line %d: parameter %d = %s\n", lineno, n + 1, paramValues[n] ? paramValues[n] : "null");`
`1094`		`- ecpg_free((void *) (paramValues[n]));`
	`1094`	`+ ecpg_free(paramValues[n]);`
`1095`	`1095`	`}`
`1096`	`1096`	`ecpg_free(paramValues);`
`1097`	`1097`	`}`
`@@ -1138,7 +1138,7 @@ ecpg_execute(struct statement * stmt)`
`1138`	`1138`	`PGnotify *notify;`
`1139`	`1139`	`struct variable *var;`
`1140`	`1140`	`int desc_counter = 0;`
`1141`		`- const char **paramValues = NULL;`
	`1141`	`+ char **paramValues = NULL;`
`1142`	`1142`	`int nParams = 0;`
`1143`	`1143`	`int position = 0;`
`1144`	`1144`	`struct sqlca_t *sqlca = ECPGget_sqlca();`
`@@ -1380,7 +1380,7 @@ ecpg_execute(struct statement * stmt)`
`1380`	`1380`	`else`
`1381`	`1381`	`{`
`1382`	`1382`	`nParams++;`
`1383`		`- if (!(paramValues = (const char *) ecpg_realloc(paramValues, sizeof(const char ) * nParams, stmt->lineno)))`
	`1383`	`+ if (!(paramValues = (char *) ecpg_realloc(paramValues, sizeof(char ) * nParams, stmt->lineno)))`
`1384`	`1384`	`{`
`1385`	`1385`	`ecpg_free(paramValues);`
`1386`	`1386`	`return false;`
`@@ -1441,7 +1441,7 @@ ecpg_execute(struct statement * stmt)`
`1441`	`1441`	`ecpg_log("ecpg_execute on line %d: query: %s; with %d parameter(s) on connection %s\n", stmt->lineno, stmt->command, nParams, stmt->connection->name);`
`1442`	`1442`	`if (stmt->statement_type == ECPGst_execute)`
`1443`	`1443`	`{`
`1444`		`- results = PQexecPrepared(stmt->connection->connection, stmt->name, nParams, paramValues, NULL, NULL, 0);`
	`1444`	`+ results = PQexecPrepared(stmt->connection->connection, stmt->name, nParams, (const char const) paramValues, NULL, NULL, 0);`
`1445`	`1445`	`ecpg_log("ecpg_execute on line %d: using PQexecPrepared for \"%s\"\n", stmt->lineno, stmt->command);`
`1446`	`1446`	`}`
`1447`	`1447`	`else`
`@@ -1453,7 +1453,7 @@ ecpg_execute(struct statement * stmt)`
`1453`	`1453`	`}`
`1454`	`1454`	`else`
`1455`	`1455`	`{`
`1456`		`- results = PQexecParams(stmt->connection->connection, stmt->command, nParams, NULL, paramValues, NULL, NULL, 0);`
	`1456`	`+ results = PQexecParams(stmt->connection->connection, stmt->command, nParams, NULL, (const char const) paramValues, NULL, NULL, 0);`
`1457`	`1457`	`ecpg_log("ecpg_execute on line %d: using PQexecParams\n", stmt->lineno);`
`1458`	`1458`	`}`
`1459`	`1459`	`}`