diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-06-21 14:39:04 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-06-21 14:39:04 -0400 |
commit | e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 (patch) | |
tree | 8dc7df95c340803546152724fbc17aee4b8527f9 /src/fe_utils/print.c | |
parent | 8ff6d4ec7840b0af56f1207073f44b7f2afae96d (diff) |
Initial pgindent run with pg_bsd_indent version 2.0.
The new indent version includes numerous fixes thanks to Piotr Stefaniak.
The main changes visible in this commit are:
* Nicer formatting of function-pointer declarations.
* No longer unexpectedly removes spaces in expressions using casts,
sizeof, or offsetof.
* No longer wants to add a space in "struct structname *varname", as
well as some similar cases for const- or volatile-qualified pointers.
* Declarations using PG_USED_FOR_ASSERTS_ONLY are formatted more nicely.
* Fixes bug where comments following declarations were sometimes placed
with no space separating them from the code.
* Fixes some odd decisions for comments following case labels.
* Fixes some cases where comments following code were indented to less
than the expected column 33.
On the less good side, it now tends to put more whitespace around typedef
names that are not listed in typedefs.list. This might encourage us to
put more effort into typedef name collection; it's not really a bug in
indent itself.
There are more changes coming after this round, having to do with comment
indentation and alignment of lines appearing within parentheses. I wanted
to limit the size of the diffs to something that could be reviewed without
one's eyes completely glazing over, so it seemed better to split up the
changes as much as practical.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
Diffstat (limited to 'src/fe_utils/print.c')
-rw-r--r-- | src/fe_utils/print.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c index 9180b900048..4c320b215c5 100644 --- a/src/fe_utils/print.c +++ b/src/fe_utils/print.c @@ -370,7 +370,7 @@ print_unaligned_text(const printTableContent *cont, FILE *fout) { bool opt_tuples_only = cont->opt->tuples_only; unsigned int i; - const char *const * ptr; + const char *const *ptr; bool need_recordsep = false; if (cancel_pressed) @@ -461,7 +461,7 @@ print_unaligned_vertical(const printTableContent *cont, FILE *fout) { bool opt_tuples_only = cont->opt->tuples_only; unsigned int i; - const char *const * ptr; + const char *const *ptr; bool need_recordsep = false; if (cancel_pressed) @@ -606,7 +606,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager) unsigned int extra_row_output_lines = 0; unsigned int extra_output_lines = 0; - const char *const * ptr; + const char *const *ptr; struct lineptr **col_lineptrs; /* pointers to line pointer per column */ @@ -1049,7 +1049,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager) (char *) (this_line->ptr + bytes_output[j]), bytes_to_output); } - else /* Left aligned cell */ + else /* Left aligned cell */ { /* spaces second */ fputnbytes(fout, @@ -1236,7 +1236,7 @@ print_aligned_vertical(const printTableContent *cont, const printTextLineFormat *dformat = &format->lrule[PRINT_RULE_DATA]; int encoding = cont->opt->encoding; unsigned long record = cont->opt->prior_records + 1; - const char *const * ptr; + const char *const *ptr; unsigned int i, hwidth = 0, dwidth = 0, @@ -1789,7 +1789,7 @@ print_html_text(const printTableContent *cont, FILE *fout) unsigned short opt_border = cont->opt->border; const char *opt_table_attr = cont->opt->tableAttr; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -1879,7 +1879,7 @@ print_html_vertical(const printTableContent *cont, FILE *fout) const char *opt_table_attr = cont->opt->tableAttr; unsigned long record = cont->opt->prior_records + 1; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -1980,7 +1980,7 @@ print_asciidoc_text(const printTableContent *cont, FILE *fout) bool opt_tuples_only = cont->opt->tuples_only; unsigned short opt_border = cont->opt->border; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2091,7 +2091,7 @@ print_asciidoc_vertical(const printTableContent *cont, FILE *fout) unsigned short opt_border = cont->opt->border; unsigned long record = cont->opt->prior_records + 1; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2223,7 +2223,7 @@ print_latex_text(const printTableContent *cont, FILE *fout) bool opt_tuples_only = cont->opt->tuples_only; unsigned short opt_border = cont->opt->border; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2328,7 +2328,7 @@ print_latex_longtable_text(const printTableContent *cont, FILE *fout) const char *opt_table_attr = cont->opt->tableAttr; const char *next_opt_table_attr_char = opt_table_attr; const char *last_opt_table_attr_char = NULL; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2482,7 +2482,7 @@ print_latex_vertical(const printTableContent *cont, FILE *fout) unsigned short opt_border = cont->opt->border; unsigned long record = cont->opt->prior_records + 1; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2591,7 +2591,7 @@ print_troff_ms_text(const printTableContent *cont, FILE *fout) bool opt_tuples_only = cont->opt->tuples_only; unsigned short opt_border = cont->opt->border; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2684,7 +2684,7 @@ print_troff_ms_vertical(const printTableContent *cont, FILE *fout) unsigned short opt_border = cont->opt->border; unsigned long record = cont->opt->prior_records + 1; unsigned int i; - const char *const * ptr; + const char *const *ptr; unsigned short current_format = 0; /* 0=none, 1=header, 2=body */ if (cancel_pressed) |