rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-01 11:51:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

psql: Reduce the amount of const lies a bit

Browse Source
This commit is contained in:
Peter Eisentraut 2012-01-31 21:23:17 +02:00
parent 88a6ac9f93
commit 4b77bfc37a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/psql/tab-complete.c
View File

@ -3364,13 +3364,13 @@ complete_from_variables(char *text, const char *prefix, const char *suffix)
{ {
char **matches; char **matches;
int overhead = strlen(prefix) + strlen(suffix) + 1; int overhead = strlen(prefix) + strlen(suffix) + 1;
const char **varnames; char **varnames;
int nvars = 0; int nvars = 0;
int maxvars = 100; int maxvars = 100;
int i; int i;
struct _variable *ptr; struct _variable *ptr;
varnames = (const char **) pg_malloc((maxvars + 1) * sizeof(char *)); varnames = (char **) pg_malloc((maxvars + 1) * sizeof(char *));
for (ptr = pset.vars->next; ptr; ptr = ptr->next) for (ptr = pset.vars->next; ptr; ptr = ptr->next)
{ {
@ -3379,8 +3379,8 @@ complete_from_variables(char *text, const char *prefix, const char *suffix)
if (nvars >= maxvars) if (nvars >= maxvars)
{ {
maxvars *= 2; maxvars *= 2;
varnames = (const char **) realloc(varnames, varnames = (char **) realloc(varnames,
(maxvars + 1) * sizeof(char *)); (maxvars + 1) * sizeof(char *));
if (!varnames) if (!varnames)
{ {
psql_error("out of memory\n"); psql_error("out of memory\n");
@ -3394,10 +3394,10 @@ complete_from_variables(char *text, const char *prefix, const char *suffix)
} }
varnames[nvars] = NULL; varnames[nvars] = NULL;
COMPLETE_WITH_LIST(varnames); COMPLETE_WITH_LIST((const char * const *) varnames);
for (i = 0; i < nvars; i++) for (i = 0; i < nvars; i++)
free((void *) varnames[i]); free(varnames[i]);
free(varnames); free(varnames);
return matches; return matches;