mirror of
https://github.com/postgres/postgres.git
synced 2026-07-02 22:49:43 -04: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
45 lines
1.4 KiB
C
45 lines
1.4 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* aclchk_internal.h
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/aclchk_internal.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef ACLCHK_INTERNAL_H
|
|
#define ACLCHK_INTERNAL_H
|
|
|
|
#include "nodes/parsenodes.h"
|
|
#include "nodes/pg_list.h"
|
|
|
|
/*
|
|
* The information about one Grant/Revoke statement, in internal format: object
|
|
* and grantees names have been turned into Oids, the privilege list is an
|
|
* AclMode bitmask. If 'privileges' is ACL_NO_RIGHTS (the 0 value) and
|
|
* all_privs is true, 'privileges' will be internally set to the right kind of
|
|
* ACL_ALL_RIGHTS_*, depending on the object type (NB - this will modify the
|
|
* InternalGrant struct!)
|
|
*
|
|
* Note: 'all_privs' and 'privileges' represent object-level privileges only.
|
|
* There might also be column-level privilege specifications, which are
|
|
* represented in col_privs (this is a list of untransformed AccessPriv nodes).
|
|
* Column privileges are only valid for objtype ACL_OBJECT_RELATION.
|
|
*/
|
|
typedef struct
|
|
{
|
|
bool is_grant;
|
|
GrantObjectType objtype;
|
|
List *objects;
|
|
bool all_privs;
|
|
AclMode privileges;
|
|
List *col_privs;
|
|
List *grantees;
|
|
bool grant_option;
|
|
DropBehavior behavior;
|
|
} InternalGrant;
|
|
|
|
|
|
#endif /* ACLCHK_INTERNAL_H */
|