Get rid of scribbling on a const variable in psql's print.c.

tglsfdc · tglsfdc · commit 1598dc15bab3 · 2016-03-12T18:16:38.000-05:00
Commit a2dabf0 had the bright idea that it could modify a "const" global variable if it merely casted away const from a pointer. This does not work on platforms where the compiler puts "const" variables into read-only storage. Depressingly, we evidently have no such platforms in our buildfarm ... an oversight I have now remedied. (The one platform that is known to catch this is recent OS X with -fno-common.) Per report from Chris Ruprecht. Back-patch to 9.5 where the bogus code was introduced.
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -98,7 +98,7 @@ const printTextFormat pg_asciiformat_old =
 };
 
 /* Default unicode linestyle format */
-const printTextFormat pg_utf8format;
+printTextFormat pg_utf8format;
 
 typedef struct unicodeStyleRowFormat
 {
@@ -3410,7 +3410,7 @@ get_line_style(const printTableOpt *opt)
 void
 refresh_utf8format(const printTableOpt *opt)
 {
-	printTextFormat *popt = (printTextFormat *) &pg_utf8format;
+	printTextFormat *popt = &pg_utf8format;
 
 	const unicodeStyleBorderFormat *border;
 	const unicodeStyleRowFormat *header;
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
@@ -164,7 +164,7 @@ typedef struct printQueryOpt
 
 extern const printTextFormat pg_asciiformat;
 extern const printTextFormat pg_asciiformat_old;
-extern const printTextFormat pg_utf8format;
+extern printTextFormat pg_utf8format;	/* ideally would be const, but... */
 
 
 extern void disable_sigpipe_trap(void);

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ const printTextFormat pg_asciiformat_old =`
`98`	`98`	`};`
`99`	`99`
`100`	`100`	`/* Default unicode linestyle format */`
`101`		`-const printTextFormat pg_utf8format;`
	`101`	`+printTextFormat pg_utf8format;`
`102`	`102`
`103`	`103`	`typedef struct unicodeStyleRowFormat`
`104`	`104`	`{`
`@@ -3410,7 +3410,7 @@ get_line_style(const printTableOpt *opt)`
`3410`	`3410`	`void`
`3411`	`3411`	`refresh_utf8format(const printTableOpt *opt)`
`3412`	`3412`	`{`
`3413`		`- printTextFormat popt = (printTextFormat ) &pg_utf8format;`
	`3413`	`+ printTextFormat *popt = &pg_utf8format;`
`3414`	`3414`
`3415`	`3415`	`const unicodeStyleBorderFormat *border;`
`3416`	`3416`	`const unicodeStyleRowFormat *header;`