mirror of
https://github.com/postgres/postgres.git
synced 2025-11-21 00:42:43 +03:00
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
This commit is contained in:
@@ -263,7 +263,7 @@ typedef enum
|
||||
#define RUN_SECOND 1
|
||||
|
||||
typedef int (*SortTupleComparator) (const SortTuple *a, const SortTuple *b,
|
||||
Tuplesortstate *state);
|
||||
Tuplesortstate *state);
|
||||
|
||||
/*
|
||||
* Private state of a Tuplesort operation.
|
||||
@@ -314,7 +314,7 @@ struct Tuplesortstate
|
||||
* memory space thereby released.
|
||||
*/
|
||||
void (*writetup) (Tuplesortstate *state, int tapenum,
|
||||
SortTuple *stup);
|
||||
SortTuple *stup);
|
||||
|
||||
/*
|
||||
* Function to read a stored tuple from tape back into memory. 'len' is
|
||||
@@ -322,7 +322,7 @@ struct Tuplesortstate
|
||||
* from the slab memory arena, or is palloc'd, see readtup_alloc().
|
||||
*/
|
||||
void (*readtup) (Tuplesortstate *state, SortTuple *stup,
|
||||
int tapenum, unsigned int len);
|
||||
int tapenum, unsigned int len);
|
||||
|
||||
/*
|
||||
* This array holds the tuples now in sort memory. If we are in state
|
||||
@@ -2391,7 +2391,7 @@ inittapes(Tuplesortstate *state)
|
||||
* case it's not important to account for tuple space, so we don't care if
|
||||
* LACKMEM becomes inaccurate.)
|
||||
*/
|
||||
tapeSpace = (int64) maxTapes *TAPE_BUFFER_OVERHEAD;
|
||||
tapeSpace = (int64) maxTapes * TAPE_BUFFER_OVERHEAD;
|
||||
|
||||
if (tapeSpace + GetMemoryChunkSpace(state->memtuples) < state->allowedMem)
|
||||
USEMEM(state, tapeSpace);
|
||||
|
||||
Reference in New Issue
Block a user