NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc19354d

committed

const-ify functions used with completion_matches(), to suppress

cast-away-const warnings from compilers pickier than gcc.

1 parent906dce0 commitc19354dCopy full SHA for c19354d

File tree

1 file changed

+16

-15

lines changed

src/bin/psql
- tab-complete.c

1 file changed

+16

-15

lines changed

`‎src/bin/psql/tab-complete.c`

Lines changed: 16 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000-2002 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.75 2003/03/28 16:34:50 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.76 2003/04/03 20:18:16 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`/*----------------------------------------------------------------------`
`@@ -67,7 +67,7 @@ extern char *filename_completion_function();`
`67`	`67`	`#endif`
`68`	`68`
`69`	`69`	`#ifdefHAVE_RL_COMPLETION_MATCHES`
`70`		`-#definecompletion_matches(x,y)rl_completion_matches((x), ((rl_compentry_func_t *)(y)))`
	`70`	`+#definecompletion_matchesrl_completion_matches`
`71`	`71`	`#endif`
`72`	`72`
`73`	`73`	`#defineBUF_SIZE 2048`
`@@ -76,12 +76,13 @@ extern char *filename_completion_function();`
`76`	`76`
`77`	`77`	`/* Forward declaration of functions */`
`78`	`78`	`staticchar*psql_completion(chartext,intstart,intend);`
`79`		`-staticcharcreate_command_generator(chartext,intstate);`
`80`		`-staticcharcomplete_from_query(chartext,intstate);`
`81`		`-staticcharcomplete_from_schema_query(chartext,intstate);`
`82`		`-staticchar_complete_from_query(intis_schema_query,chartext,intstate);`
`83`		`-staticcharcomplete_from_const(chartext,intstate);`
`84`		`-staticcharcomplete_from_list(chartext,intstate);`
	`79`	`+staticcharcreate_command_generator(constchartext,intstate);`
	`80`	`+staticcharcomplete_from_query(constchartext,intstate);`
	`81`	`+staticcharcomplete_from_schema_query(constchartext,intstate);`
	`82`	`+staticchar*_complete_from_query(intis_schema_query,`
	`83`	`+constchar*text,intstate);`
	`84`	`+staticcharcomplete_from_const(constchartext,intstate);`
	`85`	`+staticcharcomplete_from_list(constchartext,intstate);`
`85`	`86`
`86`	`87`	`staticPGresultexec_query(charquery);`
`87`	`88`	`charquote_file_name(chartext,intmatch_type,char*quote_pointer);`
`@@ -1357,7 +1358,7 @@ psql_completion(char *text, int start, int end)`
`1357`	`1358`	`as defined above.`
`1358`	`1359`	`*/`
`1359`	`1360`	`staticchar*`
`1360`		`-create_command_generator(char*text,intstate)`
	`1361`	`+create_command_generator(constchar*text,intstate)`
`1361`	`1362`	`{`
`1362`	`1363`	`staticintlist_index,`
`1363`	`1364`	`string_length;`
`@@ -1383,13 +1384,13 @@ create_command_generator(char *text, int state)`
`1383`	`1384`	`/* The following two functions are wrappers for _complete_from_query */`
`1384`	`1385`
`1385`	`1386`	`staticchar*`
`1386`		`-complete_from_query(char*text,intstate)`
	`1387`	`+complete_from_query(constchar*text,intstate)`
`1387`	`1388`	`{`
`1388`	`1389`	`return_complete_from_query(0,text,state);`
`1389`	`1390`	`}`
`1390`	`1391`
`1391`	`1392`	`staticchar*`
`1392`		`-complete_from_schema_query(char*text,intstate)`
	`1393`	`+complete_from_schema_query(constchar*text,intstate)`
`1393`	`1394`	`{`
`1394`	`1395`	`return_complete_from_query(1,text,state);`
`1395`	`1396`	`}`
`@@ -1412,7 +1413,7 @@ complete_from_schema_query(char *text, int state)`
`1412`	`1413`	`*/`
`1413`	`1414`
`1414`	`1415`	`staticchar*`
`1415`		`-_complete_from_query(intis_schema_query,char*text,intstate)`
	`1416`	`+_complete_from_query(intis_schema_query,constchar*text,intstate)`
`1416`	`1417`	`{`
`1417`	`1418`	`staticintlist_index,`
`1418`	`1419`	`string_length;`
`@@ -1421,7 +1422,7 @@ _complete_from_query(int is_schema_query, char *text, int state)`
`1421`	`1422`	`constchar*item;`
`1422`	`1423`
`1423`	`1424`	`/*`
`1424`		`- * If thisist the first time for this completion, we fetch a list of`
	`1425`	`+ * If thisis the first time for this completion, we fetch a list of`
`1425`	`1426`	`* our "things" from the backend.`
`1426`	`1427`	`*/`
`1427`	`1428`	`if (state==0)`
`@@ -1471,7 +1472,7 @@ _complete_from_query(int is_schema_query, char *text, int state)`
`1471`	`1472`	`SQL words that can appear at certain spot.`
`1472`	`1473`	`*/`
`1473`	`1474`	`staticchar*`
`1474`		`-complete_from_list(char*text,intstate)`
	`1475`	`+complete_from_list(constchar*text,intstate)`
`1475`	`1476`	`{`
`1476`	`1477`	`staticintstring_length,`
`1477`	`1478`	`list_index,`
`@@ -1531,7 +1532,7 @@ complete_from_list(char *text, int state)`
`1531`	`1532`	`The string to be passed must be in completion_charp.`
`1532`	`1533`	`*/`
`1533`	`1534`	`staticchar*`
`1534`		`-complete_from_const(char*text,intstate)`
	`1535`	`+complete_from_const(constchar*text,intstate)`
`1535`	`1536`	`{`
`1536`	`1537`	`(void)text;/* We don't care about what was entered`
`1537`	`1538`	`* already. */`

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!

Commitc19354d

File tree

1 file changed

1 file changed

`‎src/bin/psql/tab-complete.c`

0 commit comments