mirror of
https://github.com/postgres/postgres.git
synced 2025-10-27 00:12:01 +03:00
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
46 lines
1.7 KiB
C
46 lines
1.7 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* buffile.h
|
|
* Management of large buffered files, primarily temporary files.
|
|
*
|
|
* The BufFile routines provide a partial replacement for stdio atop
|
|
* virtual file descriptors managed by fd.c. Currently they only support
|
|
* buffered access to a virtual file, without any of stdio's formatting
|
|
* features. That's enough for immediate needs, but the set of facilities
|
|
* could be expanded if necessary.
|
|
*
|
|
* BufFile also supports working with temporary files that exceed the OS
|
|
* file size limit and/or the largest offset representable in an int.
|
|
* It might be better to split that out as a separately accessible module,
|
|
* but currently we have no need for oversize temp files without buffered
|
|
* access.
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/storage/buffile.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
|
|
#ifndef BUFFILE_H
|
|
#define BUFFILE_H
|
|
|
|
/* BufFile is an opaque type whose details are not known outside buffile.c. */
|
|
|
|
typedef struct BufFile BufFile;
|
|
|
|
/*
|
|
* prototypes for functions in buffile.c
|
|
*/
|
|
|
|
extern BufFile *BufFileCreateTemp(bool interXact);
|
|
extern void BufFileClose(BufFile *file);
|
|
extern size_t BufFileRead(BufFile *file, void *ptr, size_t size);
|
|
extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size);
|
|
extern int BufFileSeek(BufFile *file, int fileno, off_t offset, int whence);
|
|
extern void BufFileTell(BufFile *file, int *fileno, off_t *offset);
|
|
extern int BufFileSeekBlock(BufFile *file, long blknum);
|
|
|
|
#endif /* BUFFILE_H */
|