mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-07-15 15:01:09 +02: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
78 lines
2.6 KiB
C
78 lines
2.6 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* relptr.h
|
|
* This file contains basic declarations for relative pointers.
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/relptr.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef RELPTR_H
|
|
#define RELPTR_H
|
|
|
|
/*
|
|
* Relative pointers are intended to be used when storing an address that may
|
|
* be relative either to the base of the process's address space or some
|
|
* dynamic shared memory segment mapped therein.
|
|
*
|
|
* The idea here is that you declare a relative pointer as relptr(type)
|
|
* and then use relptr_access to dereference it and relptr_store to change
|
|
* it. The use of a union here is a hack, because what's stored in the
|
|
* relptr is always a Size, never an actual pointer. But including a pointer
|
|
* in the union allows us to use stupid macro tricks to provide some measure
|
|
* of type-safety.
|
|
*/
|
|
#define relptr(type) union { type *relptr_type; Size relptr_off; }
|
|
|
|
/*
|
|
* pgindent gets confused by declarations that use "relptr(type)" directly,
|
|
* so preferred style is to write
|
|
* typedef struct ... SomeStruct;
|
|
* relptr_declare(SomeStruct, RelptrSomeStruct);
|
|
* and then declare pointer variables as "RelptrSomeStruct someptr".
|
|
*/
|
|
#define relptr_declare(type, relptrtype) \
|
|
typedef relptr(type) relptrtype
|
|
|
|
#ifdef HAVE__BUILTIN_TYPES_COMPATIBLE_P
|
|
#define relptr_access(base, rp) \
|
|
(AssertVariableIsOfTypeMacro(base, char *), \
|
|
(__typeof__((rp).relptr_type)) ((rp).relptr_off == 0 ? NULL : \
|
|
(base + (rp).relptr_off)))
|
|
#else
|
|
/*
|
|
* If we don't have __builtin_types_compatible_p, assume we might not have
|
|
* __typeof__ either.
|
|
*/
|
|
#define relptr_access(base, rp) \
|
|
(AssertVariableIsOfTypeMacro(base, char *), \
|
|
(void *) ((rp).relptr_off == 0 ? NULL : (base + (rp).relptr_off)))
|
|
#endif
|
|
|
|
#define relptr_is_null(rp) \
|
|
((rp).relptr_off == 0)
|
|
|
|
#ifdef HAVE__BUILTIN_TYPES_COMPATIBLE_P
|
|
#define relptr_store(base, rp, val) \
|
|
(AssertVariableIsOfTypeMacro(base, char *), \
|
|
AssertVariableIsOfTypeMacro(val, __typeof__((rp).relptr_type)), \
|
|
(rp).relptr_off = ((val) == NULL ? 0 : ((char *) (val)) - (base)))
|
|
#else
|
|
/*
|
|
* If we don't have __builtin_types_compatible_p, assume we might not have
|
|
* __typeof__ either.
|
|
*/
|
|
#define relptr_store(base, rp, val) \
|
|
(AssertVariableIsOfTypeMacro(base, char *), \
|
|
(rp).relptr_off = ((val) == NULL ? 0 : ((char *) (val)) - (base)))
|
|
#endif
|
|
|
|
#define relptr_copy(rp1, rp2) \
|
|
((rp1).relptr_off = (rp2).relptr_off)
|
|
|
|
#endif /* RELPTR_H */
|