mirror of
https://github.com/postgres/postgres.git
synced 2026-03-02 21:30:36 -05:00
c7b8998ebb
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4d wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
77 lines
2.1 KiB
C
77 lines
2.1 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* pg_conversion.h
|
|
* definition of the system "conversion" relation (pg_conversion)
|
|
* along with the relation's initial contents.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/catalog/pg_conversion.h
|
|
*
|
|
* NOTES
|
|
* the genbki.pl script reads this file and generates .bki
|
|
* information from the DATA() statements.
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef PG_CONVERSION_H
|
|
#define PG_CONVERSION_H
|
|
|
|
#include "catalog/genbki.h"
|
|
|
|
/* ----------------------------------------------------------------
|
|
* pg_conversion definition.
|
|
*
|
|
* cpp turns this into typedef struct FormData_pg_namespace
|
|
*
|
|
* conname name of the conversion
|
|
* connamespace name space which the conversion belongs to
|
|
* conowner owner of the conversion
|
|
* conforencoding FOR encoding id
|
|
* contoencoding TO encoding id
|
|
* conproc OID of the conversion proc
|
|
* condefault TRUE if this is a default conversion
|
|
* ----------------------------------------------------------------
|
|
*/
|
|
#define ConversionRelationId 2607
|
|
|
|
CATALOG(pg_conversion,2607)
|
|
{
|
|
NameData conname;
|
|
Oid connamespace;
|
|
Oid conowner;
|
|
int32 conforencoding;
|
|
int32 contoencoding;
|
|
regproc conproc;
|
|
bool condefault;
|
|
} FormData_pg_conversion;
|
|
|
|
/* ----------------
|
|
* Form_pg_conversion corresponds to a pointer to a tuple with
|
|
* the format of pg_conversion relation.
|
|
* ----------------
|
|
*/
|
|
typedef FormData_pg_conversion *Form_pg_conversion;
|
|
|
|
/* ----------------
|
|
* compiler constants for pg_conversion
|
|
* ----------------
|
|
*/
|
|
|
|
#define Natts_pg_conversion 7
|
|
#define Anum_pg_conversion_conname 1
|
|
#define Anum_pg_conversion_connamespace 2
|
|
#define Anum_pg_conversion_conowner 3
|
|
#define Anum_pg_conversion_conforencoding 4
|
|
#define Anum_pg_conversion_contoencoding 5
|
|
#define Anum_pg_conversion_conproc 6
|
|
#define Anum_pg_conversion_condefault 7
|
|
|
|
/* ----------------
|
|
* initial contents of pg_conversion
|
|
* ---------------
|
|
*/
|
|
|
|
#endif /* PG_CONVERSION_H */
|