mirror of
https://github.com/postgres/postgres.git
synced 2026-01-27 21:43:08 +03:00
Add trailing commas to enum definitions
Since C99, there can be a trailing comma after the last value in an enum definition. A lot of new code has been introducing this style on the fly. Some new patches are now taking an inconsistent approach to this. Some add the last comma on the fly if they add a new last value, some are trying to preserve the existing style in each place, some are even dropping the last comma if there was one. We could nudge this all in a consistent direction if we just add the trailing commas everywhere once. I omitted a few places where there was a fixed "last" value that will always stay last. I also skipped the header files of libpq and ecpg, in case people want to use those with older compilers. There were also a small number of cases where the enum type wasn't used anywhere (but the enum values were), which ended up confusing pgindent a bit, so I left those alone. Discussion: https://www.postgresql.org/message-id/flat/386f8c45-c8ac-4681-8add-e3b0852c1620%40eisentraut.org
This commit is contained in:
@@ -39,7 +39,7 @@ typedef enum ifState
|
||||
* false parent branch */
|
||||
IFSTATE_ELSE_TRUE, /* currently in an \else that is true and all
|
||||
* parent branches (if any) are true */
|
||||
IFSTATE_ELSE_FALSE /* currently in an \else that is false or
|
||||
IFSTATE_ELSE_FALSE, /* currently in an \else that is false or
|
||||
* ignored */
|
||||
} ifState;
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ enum printFormat
|
||||
PRINT_LATEX_LONGTABLE,
|
||||
PRINT_TROFF_MS,
|
||||
PRINT_UNALIGNED,
|
||||
PRINT_WRAPPED
|
||||
PRINT_WRAPPED,
|
||||
/* add your favourite output format here ... */
|
||||
};
|
||||
|
||||
@@ -55,7 +55,7 @@ typedef enum printTextRule
|
||||
PRINT_RULE_TOP, /* top horizontal line */
|
||||
PRINT_RULE_MIDDLE, /* intra-data horizontal line */
|
||||
PRINT_RULE_BOTTOM, /* bottom horizontal line */
|
||||
PRINT_RULE_DATA /* data line (hrule is unused here) */
|
||||
PRINT_RULE_DATA, /* data line (hrule is unused here) */
|
||||
} printTextRule;
|
||||
|
||||
typedef enum printTextLineWrap
|
||||
@@ -63,7 +63,7 @@ typedef enum printTextLineWrap
|
||||
/* Line wrapping conditions */
|
||||
PRINT_LINE_WRAP_NONE, /* No wrapping */
|
||||
PRINT_LINE_WRAP_WRAP, /* Wraparound due to overlength line */
|
||||
PRINT_LINE_WRAP_NEWLINE /* Newline in data */
|
||||
PRINT_LINE_WRAP_NEWLINE, /* Newline in data */
|
||||
} printTextLineWrap;
|
||||
|
||||
typedef enum printXheaderWidthType
|
||||
@@ -99,7 +99,7 @@ typedef struct printTextFormat
|
||||
typedef enum unicode_linestyle
|
||||
{
|
||||
UNICODE_LINESTYLE_SINGLE = 0,
|
||||
UNICODE_LINESTYLE_DOUBLE
|
||||
UNICODE_LINESTYLE_DOUBLE,
|
||||
} unicode_linestyle;
|
||||
|
||||
struct separator
|
||||
|
||||
@@ -32,7 +32,7 @@ typedef enum
|
||||
PSCAN_SEMICOLON, /* found command-ending semicolon */
|
||||
PSCAN_BACKSLASH, /* found backslash command */
|
||||
PSCAN_INCOMPLETE, /* end of line, SQL statement incomplete */
|
||||
PSCAN_EOL /* end of line, SQL possibly complete */
|
||||
PSCAN_EOL, /* end of line, SQL possibly complete */
|
||||
} PsqlScanResult;
|
||||
|
||||
/* Prompt type returned by psql_scan() */
|
||||
@@ -45,7 +45,7 @@ typedef enum _promptStatus
|
||||
PROMPT_DOUBLEQUOTE,
|
||||
PROMPT_DOLLARQUOTE,
|
||||
PROMPT_PAREN,
|
||||
PROMPT_COPY
|
||||
PROMPT_COPY,
|
||||
} promptStatus_t;
|
||||
|
||||
/* Quoting request types for get_variable() callback */
|
||||
@@ -54,7 +54,7 @@ typedef enum
|
||||
PQUOTE_PLAIN, /* just return the actual value */
|
||||
PQUOTE_SQL_LITERAL, /* add quotes to make a valid SQL literal */
|
||||
PQUOTE_SQL_IDENT, /* quote if needed to make a SQL identifier */
|
||||
PQUOTE_SHELL_ARG /* quote if needed to be safe in a shell cmd */
|
||||
PQUOTE_SHELL_ARG, /* quote if needed to be safe in a shell cmd */
|
||||
} PsqlScanQuoteType;
|
||||
|
||||
/* Callback functions to be used by the lexer */
|
||||
|
||||
Reference in New Issue
Block a user