NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit1598dc1

committed

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

Commita2dabf0 had the bright idea that it could modify a "const"global variable if it merely casted away const from a pointer. This doesnot work on platforms where the compiler puts "const" variables intoread-only storage. Depressingly, we evidently have no such platforms inour buildfarm ... an oversight I have now remedied. (The one platformthat is known to catch this is recent OS X with -fno-common.)Per report from Chris Ruprecht. Back-patch to 9.5 where the boguscode was introduced.

1 parentc84c87c commit1598dc1Copy full SHA for 1598dc1

File tree

2 files changed

-3

lines changed

src/bin/psql
- print.c
- print.h

2 files changed

-3

lines changed

`‎src/bin/psql/print.c`

Lines changed: 2 additions & 2 deletions

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`		`-constprintTextFormatpg_utf8format;`
	`101`	`+printTextFormatpg_utf8format;`
`102`	`102`
`103`	`103`	`typedefstructunicodeStyleRowFormat`
`104`	`104`	`{`
`@@ -3410,7 +3410,7 @@ get_line_style(const printTableOpt *opt)`
`3410`	`3410`	`void`
`3411`	`3411`	`refresh_utf8format(constprintTableOpt*opt)`
`3412`	`3412`	`{`
`3413`		`-printTextFormatpopt=(printTextFormat)&pg_utf8format;`
	`3413`	`+printTextFormat*popt=&pg_utf8format;`
`3414`	`3414`
`3415`	`3415`	`constunicodeStyleBorderFormat*border;`
`3416`	`3416`	`constunicodeStyleRowFormat*header;`

`‎src/bin/psql/print.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ typedef struct printQueryOpt`
`164`	`164`
`165`	`165`	`externconstprintTextFormatpg_asciiformat;`
`166`	`166`	`externconstprintTextFormatpg_asciiformat_old;`
`167`		`-externconstprintTextFormatpg_utf8format;`
	`167`	`+externprintTextFormatpg_utf8format;/* ideally would be const, but... */`
`168`	`168`
`169`	`169`
`170`	`170`	`externvoiddisable_sigpipe_trap(void);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1598dc1

File tree

2 files changed

2 files changed

`‎src/bin/psql/print.c`

`‎src/bin/psql/print.h`

0 commit comments