rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run the C portions of guc-file.l through pgindent. 

Yeah, I know, pretty anal-retentive of me.  But we oughta find some
way to automate this for the .y and .l files.
This commit is contained in:
Tom Lane 2015-06-28 20:49:35 -04:00
parent 62d16c7fc5
commit 2bdc51a294
1 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,8 @@
#undef fprintf #undef fprintf
#define fprintf(file, fmt, msg) GUC_flex_fatal(msg) #define fprintf(file, fmt, msg) GUC_flex_fatal(msg)
enum { enum
{
GUC_ID = 1, GUC_ID = 1,
GUC_STRING = 2, GUC_STRING = 2,
GUC_INTEGER = 3, GUC_INTEGER = 3,
@ -53,7 +54,7 @@ static void record_config_file_error(const char *errmsg,
ConfigVariable **head_p, ConfigVariable **head_p,
ConfigVariable **tail_p); ConfigVariable **tail_p);
static int GUC_flex_fatal(const char *msg); static int GUC_flex_fatal(const char *msg);
static char *GUC_scanstr(const char *s); static char *GUC_scanstr(const char *s);
%} %}
@ -124,15 +125,15 @@ ProcessConfigFile(GucContext context)
MemoryContext caller_cxt; MemoryContext caller_cxt;
/* /*
* Config files are processed on startup (by the postmaster only) * Config files are processed on startup (by the postmaster only) and on
* and on SIGHUP (by the postmaster and its children) * SIGHUP (by the postmaster and its children)
*/ */
Assert((context == PGC_POSTMASTER && !IsUnderPostmaster) || Assert((context == PGC_POSTMASTER && !IsUnderPostmaster) ||
context == PGC_SIGHUP); context == PGC_SIGHUP);
/* /*
* To avoid cluttering the log, only the postmaster bleats loudly * To avoid cluttering the log, only the postmaster bleats loudly about
* about problems with the config file. * problems with the config file.
*/ */
elevel = IsUnderPostmaster ? DEBUG2 : LOG; elevel = IsUnderPostmaster ? DEBUG2 : LOG;
@ -191,10 +192,10 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
} }
/* /*
* Parse the PG_AUTOCONF_FILENAME file, if present, after the main file * Parse the PG_AUTOCONF_FILENAME file, if present, after the main file to
* to replace any parameters set by ALTER SYSTEM command. Because this * replace any parameters set by ALTER SYSTEM command. Because this file
* file is in the data directory, we can't read it until the DataDir has * is in the data directory, we can't read it until the DataDir has been
* been set. * set.
*/ */
if (DataDir) if (DataDir)
{ {
@ -246,9 +247,9 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
} }
/* /*
* Mark all extant GUC variables as not present in the config file. * Mark all extant GUC variables as not present in the config file. We
* We need this so that we can tell below which ones have been removed * need this so that we can tell below which ones have been removed from
* from the file since we last processed it. * the file since we last processed it.
*/ */
for (i = 0; i < num_guc_variables; i++) for (i = 0; i < num_guc_variables; i++)
{ {
@ -260,15 +261,15 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
/* /*
* Check if all the supplied option names are valid, as an additional * Check if all the supplied option names are valid, as an additional
* quasi-syntactic check on the validity of the config file. It is * quasi-syntactic check on the validity of the config file. It is
* important that the postmaster and all backends agree on the results * important that the postmaster and all backends agree on the results of
* of this phase, else we will have strange inconsistencies about which * this phase, else we will have strange inconsistencies about which
* processes accept a config file update and which don't. Hence, unknown * processes accept a config file update and which don't. Hence, unknown
* custom variable names have to be accepted without complaint. For the * custom variable names have to be accepted without complaint. For the
* same reason, we don't attempt to validate the options' values here. * same reason, we don't attempt to validate the options' values here.
* *
* In addition, the GUC_IS_IN_FILE flag is set on each existing GUC * In addition, the GUC_IS_IN_FILE flag is set on each existing GUC
* variable mentioned in the file; and we detect duplicate entries in * variable mentioned in the file; and we detect duplicate entries in the
* the file and mark the earlier occurrences as ignorable. * file and mark the earlier occurrences as ignorable.
*/ */
for (item = head; item; item = item->next) for (item = head; item; item = item->next)
{ {
@ -279,8 +280,8 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
continue; continue;
/* /*
* Try to find the variable; but do not create a custom placeholder * Try to find the variable; but do not create a custom placeholder if
* if it's not there already. * it's not there already.
*/ */
record = find_option(item->name, false, elevel); record = find_option(item->name, false, elevel);
@ -321,8 +322,8 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
} }
/* /*
* If we've detected any errors so far, we don't want to risk applying * If we've detected any errors so far, we don't want to risk applying any
* any changes. * changes.
*/ */
if (error) if (error)
goto bail_out; goto bail_out;
@ -363,8 +364,8 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
continue; continue;
/* /*
* Reset any "file" sources to "default", else set_config_option * Reset any "file" sources to "default", else set_config_option will
* will not override those settings. * not override those settings.
*/ */
if (gconf->reset_source == PGC_S_FILE) if (gconf->reset_source == PGC_S_FILE)
gconf->reset_source = PGC_S_DEFAULT; gconf->reset_source = PGC_S_DEFAULT;
@ -394,14 +395,14 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
* dynamically-computed defaults. This is a no-op except in the case * dynamically-computed defaults. This is a no-op except in the case
* where one of these had been in the config file and is now removed. * where one of these had been in the config file and is now removed.
* *
* In particular, we *must not* do this during the postmaster's * In particular, we *must not* do this during the postmaster's initial
* initial loading of the file, since the timezone functions in * loading of the file, since the timezone functions in particular should
* particular should be run only after initialization is complete. * be run only after initialization is complete.
* *
* XXX this is an unmaintainable crock, because we have to know how * XXX this is an unmaintainable crock, because we have to know how to set
* to set (or at least what to call to set) every variable that could * (or at least what to call to set) every variable that could potentially
* potentially have PGC_S_DYNAMIC_DEFAULT or PGC_S_ENV_VAR source. * have PGC_S_DYNAMIC_DEFAULT or PGC_S_ENV_VAR source. However, there's no
* However, there's no time to redesign it for 9.1. * time to redesign it for 9.1.
*/ */
if (context == PGC_SIGHUP && applySettings) if (context == PGC_SIGHUP && applySettings)
{ {
@ -417,8 +418,8 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
*/ */
for (item = head; item; item = item->next) for (item = head; item; item = item->next)
{ {
char *pre_value = NULL; char *pre_value = NULL;
int scres; int scres;
/* Ignore anything marked as ignorable */ /* Ignore anything marked as ignorable */
if (item->ignore) if (item->ignore)
@ -485,7 +486,7 @@ ProcessConfigFileInternal(GucContext context, bool applySettings, int elevel)
if (applySettings) if (applySettings)
PgReloadTime = GetCurrentTimestamp(); PgReloadTime = GetCurrentTimestamp();
bail_out: bail_out:
if (error && applySettings) if (error && applySettings)
{ {
/* During postmaster startup, any error is fatal */ /* During postmaster startup, any error is fatal */
@ -567,9 +568,9 @@ ParseConfigFile(const char *config_file, bool strict,
FILE *fp; FILE *fp;
/* /*
* Reject too-deep include nesting depth. This is just a safety check * Reject too-deep include nesting depth. This is just a safety check to
* to avoid dumping core due to stack overflow if an include file loops * avoid dumping core due to stack overflow if an include file loops back
* back to itself. The maximum nesting depth is pretty arbitrary. * to itself. The maximum nesting depth is pretty arbitrary.
*/ */
if (depth > 10) if (depth > 10)
{ {
@ -660,7 +661,7 @@ GUC_flex_fatal(const char *msg)
{ {
GUC_flex_fatal_errmsg = msg; GUC_flex_fatal_errmsg = msg;
siglongjmp(*GUC_flex_fatal_jmp, 1); siglongjmp(*GUC_flex_fatal_jmp, 1);
return 0; /* keep compiler quiet */ return 0; /* keep compiler quiet */
} }
/* /*
@ -828,7 +829,7 @@ ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
item->value = opt_value; item->value = opt_value;
item->errmsg = NULL; item->errmsg = NULL;
item->filename = pstrdup(config_file); item->filename = pstrdup(config_file);
item->sourceline = ConfigFileLineno-1; item->sourceline = ConfigFileLineno - 1;
item->ignore = false; item->ignore = false;
item->applied = false; item->applied = false;
item->next = NULL; item->next = NULL;
@ -844,7 +845,7 @@ ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
break; break;
continue; continue;
parse_error: parse_error:
/* release storage if we allocated any on this line */ /* release storage if we allocated any on this line */
if (opt_name) if (opt_name)
pfree(opt_name); pfree(opt_name);
@ -856,8 +857,8 @@ ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
{ {
ereport(elevel, ereport(elevel,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error in file \"%s\" line %u, near end of line", errmsg("syntax error in file \"%s\" line %u, near end of line",
config_file, ConfigFileLineno - 1))); config_file, ConfigFileLineno - 1)));
record_config_file_error("syntax error", record_config_file_error("syntax error",
config_file, ConfigFileLineno - 1, config_file, ConfigFileLineno - 1,
head_p, tail_p); head_p, tail_p);
@ -866,8 +867,8 @@ ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
{ {
ereport(elevel, ereport(elevel,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error in file \"%s\" line %u, near token \"%s\"", errmsg("syntax error in file \"%s\" line %u, near token \"%s\"",
config_file, ConfigFileLineno, yytext))); config_file, ConfigFileLineno, yytext)));
record_config_file_error("syntax error", record_config_file_error("syntax error",
config_file, ConfigFileLineno, config_file, ConfigFileLineno,
head_p, tail_p); head_p, tail_p);
@ -878,16 +879,16 @@ ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
/* /*
* To avoid producing too much noise when fed a totally bogus file, * To avoid producing too much noise when fed a totally bogus file,
* give up after 100 syntax errors per file (an arbitrary number). * give up after 100 syntax errors per file (an arbitrary number).
* Also, if we're only logging the errors at DEBUG level anyway, * Also, if we're only logging the errors at DEBUG level anyway, might
* might as well give up immediately. (This prevents postmaster * as well give up immediately. (This prevents postmaster children
* children from bloating the logs with duplicate complaints.) * from bloating the logs with duplicate complaints.)
*/ */
if (errorcount >= 100 || elevel <= DEBUG1) if (errorcount >= 100 || elevel <= DEBUG1)
{ {
ereport(elevel, ereport(elevel,
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
errmsg("too many syntax errors found, abandoning file \"%s\"", errmsg("too many syntax errors found, abandoning file \"%s\"",
config_file))); config_file)));
break; break;
} }
@ -959,7 +960,7 @@ ParseConfigDirectory(const char *includedir,
while ((de = ReadDir(d, directory)) != NULL) while ((de = ReadDir(d, directory)) != NULL)
{ {
struct stat st; struct stat st;
char filename[MAXPGPATH]; char filename[MAXPGPATH];
/* /*
* Only parse files with names ending in ".conf". Explicitly reject * Only parse files with names ending in ".conf". Explicitly reject
@ -984,7 +985,7 @@ ParseConfigDirectory(const char *includedir,
{ {
size_filenames += 32; size_filenames += 32;
filenames = (char **) repalloc(filenames, filenames = (char **) repalloc(filenames,
size_filenames * sizeof(char *)); size_filenames * sizeof(char *));
} }
filenames[num_filenames] = pstrdup(filename); filenames[num_filenames] = pstrdup(filename);
num_filenames++; num_filenames++;
@ -1013,6 +1014,7 @@ ParseConfigDirectory(const char *includedir,
if (num_filenames > 0) if (num_filenames > 0)
{ {
int i; int i;
qsort(filenames, num_filenames, sizeof(char *), pg_qsort_strcmp); qsort(filenames, num_filenames, sizeof(char *), pg_qsort_strcmp);
for (i = 0; i < num_filenames; i++) for (i = 0; i < num_filenames; i++)
{ {
@ -1091,7 +1093,7 @@ GUC_scanstr(const char *s)
Assert(s != NULL && s[0] == '\''); Assert(s != NULL && s[0] == '\'');
len = strlen(s); len = strlen(s);
Assert(len >= 2); Assert(len >= 2);
Assert(s[len-1] == '\''); Assert(s[len - 1] == '\'');
/* Skip the leading quote; we'll handle the trailing quote below */ /* Skip the leading quote; we'll handle the trailing quote below */
s++, len--; s++, len--;
@ -1146,7 +1148,7 @@ GUC_scanstr(const char *s)
break; break;
} /* switch */ } /* switch */
} }
else if (s[i] == '\'' && s[i+1] == '\'') else if (s[i] == '\'' && s[i + 1] == '\'')
{ {
/* doubled quote becomes just one quote */ /* doubled quote becomes just one quote */
newStr[j] = s[++i]; newStr[j] = s[++i];