Cosmetic PL/PgSQL fix: declare the second parameter plpgsql_dstring_append

Neil Conway · Neil Conway · commit d1b0d965b115 · 2004-09-14T23:46:46.000Z
as a const char *, so that we don't need to cast away a const in gram.y
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
  *						  procedural language
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.61 2004/08/20 22:00:14 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.62 2004/09/14 23:46:46 neilc Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -1709,7 +1709,7 @@ read_sql_construct(int until,
 
 	lno = plpgsql_scanner_lineno();
 	plpgsql_dstring_init(&ds);
-	plpgsql_dstring_append(&ds, (char *) sqlstart);
+	plpgsql_dstring_append(&ds, sqlstart);
 
 	for (;;)
 	{
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.36 2004/08/30 02:54:42 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.37 2004/09/14 23:46:46 neilc Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -80,7 +80,7 @@ plpgsql_dstring_free(PLpgSQL_dstring *ds)
  * ----------
  */
 void
-plpgsql_dstring_append(PLpgSQL_dstring *ds, char *str)
+plpgsql_dstring_append(PLpgSQL_dstring *ds, const char *str)
 {
 	int			len = strlen(str);
 	int			needed = ds->used + len + 1;
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.54 2004/09/13 20:09:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.55 2004/09/14 23:46:46 neilc Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -716,7 +716,7 @@ extern void plpgsql_xact_cb(XactEvent event, TransactionId parentXid, void *arg)
  */
 extern void plpgsql_dstring_init(PLpgSQL_dstring *ds);
 extern void plpgsql_dstring_free(PLpgSQL_dstring *ds);
-extern void plpgsql_dstring_append(PLpgSQL_dstring *ds, char *str);
+extern void plpgsql_dstring_append(PLpgSQL_dstring *ds, const char *str);
 extern char *plpgsql_dstring_get(PLpgSQL_dstring *ds);
 
 /* ----------

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* procedural language`
`5`	`5`	`*`
`6`	`6`	`* IDENTIFICATION`
`7`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.61 2004/08/20 22:00:14 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.62 2004/09/14 23:46:46 neilc Exp $`
`8`	`8`	`*`
`9`	`9`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`10`	`10`	`*`
`@@ -1709,7 +1709,7 @@ read_sql_construct(int until,`
`1709`	`1709`
`1710`	`1710`	`lno = plpgsql_scanner_lineno();`
`1711`	`1711`	`plpgsql_dstring_init(&ds);`
`1712`		`- plpgsql_dstring_append(&ds, (char *) sqlstart);`
	`1712`	`+ plpgsql_dstring_append(&ds, sqlstart);`
`1713`	`1713`
`1714`	`1714`	`for (;;)`
`1715`	`1715`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* procedural language`
`4`	`4`	`*`
`5`	`5`	`* IDENTIFICATION`
`6`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.36 2004/08/30 02:54:42 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.37 2004/09/14 23:46:46 neilc Exp $`
`7`	`7`	`*`
`8`	`8`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`9`	`9`	`*`
`@@ -80,7 +80,7 @@ plpgsql_dstring_free(PLpgSQL_dstring *ds)`
`80`	`80`	`* ----------`
`81`	`81`	`*/`
`82`	`82`	`void`
`83`		`-plpgsql_dstring_append(PLpgSQL_dstring ds, char str)`
	`83`	`+plpgsql_dstring_append(PLpgSQL_dstring ds, const char str)`
`84`	`84`	`{`
`85`	`85`	`int len = strlen(str);`
`86`	`86`	`int needed = ds->used + len + 1;`