mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Un-break custom_variable_classes kluge ... mea culpa.

Browse Source
This commit is contained in:
Tom Lane 2004-11-11 23:45:13 +00:00
parent fc402fdf2d
commit 664f93ce18
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/utils/misc/guc-file.l
View File

@ -4,7 +4,7 @@
* *
* Copyright (c) 2000-2004, PostgreSQL Global Development Group * Copyright (c) 2000-2004, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.26 2004/10/08 01:36:35 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.27 2004/11/11 23:45:13 tgl Exp $
*/ */
%{ %{
@ -203,25 +203,28 @@ ProcessConfigFile(GucContext context)
if (token != GUC_EOL) if (token != GUC_EOL)
goto parse_error; goto parse_error;
item = palloc(sizeof *item);
item->name = opt_name;
item->value = opt_value;
if (strcmp(opt_name, "custom_variable_classes") == 0) if (strcmp(opt_name, "custom_variable_classes") == 0)
{ {
/* /*
* This variable must be processed first as it controls * This variable must be processed first as it controls
* the validity of other variables; so prepend to * the validity of other variables; so apply immediately.
* the list instead of appending.
*/ */
item->next = head; if (!set_config_option(opt_name, opt_value, context,
head = item; PGC_S_FILE, false, true))
if (!tail) {
tail = item; pfree(opt_name);
pfree(opt_value);
goto cleanup_exit;
}
pfree(opt_name);
pfree(opt_value);
} }
else else
{ {
/* append to list */ /* append to list */
item = palloc(sizeof *item);
item->name = opt_name;
item->value = opt_value;
item->next = NULL; item->next = NULL;
if (!head) if (!head)
head = item; head = item;