mirror of
https://git.postgresql.org/git/postgresql.git
synced 2026-02-08 14:57:35 +08: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 e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 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
47 lines
1.6 KiB
C
47 lines
1.6 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* logtape.h
|
|
* Management of "logical tapes" within temporary files.
|
|
*
|
|
* See logtape.c for explanations.
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/utils/logtape.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef LOGTAPE_H
|
|
#define LOGTAPE_H
|
|
|
|
/* LogicalTapeSet is an opaque type whose details are not known outside logtape.c. */
|
|
|
|
typedef struct LogicalTapeSet LogicalTapeSet;
|
|
|
|
/*
|
|
* prototypes for functions in logtape.c
|
|
*/
|
|
|
|
extern LogicalTapeSet *LogicalTapeSetCreate(int ntapes);
|
|
extern void LogicalTapeSetClose(LogicalTapeSet *lts);
|
|
extern void LogicalTapeSetForgetFreeSpace(LogicalTapeSet *lts);
|
|
extern size_t LogicalTapeRead(LogicalTapeSet *lts, int tapenum,
|
|
void *ptr, size_t size);
|
|
extern void LogicalTapeWrite(LogicalTapeSet *lts, int tapenum,
|
|
void *ptr, size_t size);
|
|
extern void LogicalTapeRewindForRead(LogicalTapeSet *lts, int tapenum,
|
|
size_t buffer_size);
|
|
extern void LogicalTapeRewindForWrite(LogicalTapeSet *lts, int tapenum);
|
|
extern void LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum);
|
|
extern size_t LogicalTapeBackspace(LogicalTapeSet *lts, int tapenum,
|
|
size_t size);
|
|
extern void LogicalTapeSeek(LogicalTapeSet *lts, int tapenum,
|
|
long blocknum, int offset);
|
|
extern void LogicalTapeTell(LogicalTapeSet *lts, int tapenum,
|
|
long *blocknum, int *offset);
|
|
extern long LogicalTapeSetBlocks(LogicalTapeSet *lts);
|
|
|
|
#endif /* LOGTAPE_H */
|