NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit92d4294

committed

psql: Fix some strange code in SQL help creation

Struct QL_HELP used to be defined as static in the sql_help.h headerfile, which is included in sql_help.c and help.c, thus creating twoseparate instances of the struct. This causes a warning from GCC 6,because the struct is not used in sql_help.c.Instead, declare the struct as extern in the header file and define itin sql_help.c. This also allows making a bunch of functions staticbecause they are no longer needed outside of sql_help.c.Reviewed-by: Thomas Munro <thomas.munro@enterprisedb.com>

1 parent0d0644d commit92d4294Copy full SHA for 92d4294

File tree

1 file changed

+10

-10

lines changed

src/bin/psql
- create_help.pl

1 file changed

+10

-10

lines changed

`‎src/bin/psql/create_help.pl`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,6 @@`
`59`	`59`	`#ifndef$define`
`60`	`60`	`#define$define`
`61`	`61`
`62`		`-#define N_(x) (x)/* gettext noop */`
`63`		`-`
`64`	`62`	`#include\"postgres_fe.h\"`
`65`	`63`	`#include\"pqexpbuffer.h\"`
`66`	`64`
`@@ -72,6 +70,7 @@`
`72`	`70`	`intnl_count;/* number of newlines in syntax (for pager) */`
`73`	`71`	`};`
`74`	`72`
	`73`	`+extern const struct _helpStruct QL_HELP[];`
`75`	`74`	`";`
`76`	`75`
`77`	`76`	`print CFILE"/*`
`@@ -83,6 +82,8 @@`
`83`	`82`	`*`
`84`	`83`	`*/`
`85`	`84`
	`85`	`+#define N_(x) (x)/* gettext noop */`
	`86`	`+`
`86`	`87`	`#include\"$hfile\"`
`87`	`88`
`88`	`89`	`";`
`@@ -170,8 +171,7 @@`
`170`	`171`	`$synopsis =~s/\\n/\\n"\n$prefix"/g;`
`171`	`172`	`my@args =`
`172`	`173`	`("buf",$synopsis,map("_(\"$_\")", @{$entries{$_}{params} }));`
`173`		`-print HFILE"extern void sql_help_$id(PQExpBuffer buf);\n";`
`174`		`-print CFILE"void`
	`174`	`+print CFILE"static void`
`175`	`175`	`sql_help_$id(PQExpBuffer buf)`
`176`	`176`	`{`
`177`	`177`	`\tappendPQExpBuffer(" .join(",\n$prefix",@args) .");`
`@@ -180,27 +180,27 @@`
`180`	`180`	`";`
`181`	`181`	`}`
`182`	`182`
`183`		`-print HFILE"`
`184`		`-`
`185`		`-static const struct _helpStruct QL_HELP[] = {`
	`183`	`+print CFILE"`
	`184`	`+const struct _helpStruct QL_HELP[] = {`
`186`	`185`	`";`
`187`	`186`	`foreach (sortkeys%entries)`
`188`	`187`	`{`
`189`	`188`	`my$id =$_;`
`190`	`189`	`$id =~s//_/g;`
`191`		`-printHFILE" {\"$_\",`
	`190`	`+printCFILE" {\"$_\",`
`192`	`191`	`N_(\"$entries{$_}{cmddesc}\"),`
`193`	`192`	`sql_help_$id,`
`194`	`193`	`$entries{$_}{nl_count} },`
`195`	`194`
`196`	`195`	`";`
`197`	`196`	`}`
`198`	`197`
`199`		`-printHFILE"`
	`198`	`+printCFILE"`
`200`	`199`	`{ NULL, NULL, NULL } /* End of list marker */`
`201`	`200`	`};`
	`201`	`+";`
`202`	`202`
`203`		`-`
	`203`	`+print HFILE"`
`204`	`204`	`#define QL_HELP_COUNT"`
`205`	`205`	`.scalar(keys%entries) ."/* number of help items */`
`206`	`206`	`#define QL_MAX_CMD_LEN$maxlen/* largest strlen(cmd) */`

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!

Commit92d4294

File tree

1 file changed

1 file changed

`‎src/bin/psql/create_help.pl`

0 commit comments