mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-04 21:26:53 +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
51 lines
2.0 KiB
C
51 lines
2.0 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* pqformat.h
|
|
* Definitions for formatting and parsing frontend/backend messages
|
|
*
|
|
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* src/include/libpq/pqformat.h
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef PQFORMAT_H
|
|
#define PQFORMAT_H
|
|
|
|
#include "lib/stringinfo.h"
|
|
|
|
extern void pq_beginmessage(StringInfo buf, char msgtype);
|
|
extern void pq_sendbyte(StringInfo buf, int byt);
|
|
extern void pq_sendbytes(StringInfo buf, const char *data, int datalen);
|
|
extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen,
|
|
bool countincludesself);
|
|
extern void pq_sendtext(StringInfo buf, const char *str, int slen);
|
|
extern void pq_sendstring(StringInfo buf, const char *str);
|
|
extern void pq_send_ascii_string(StringInfo buf, const char *str);
|
|
extern void pq_sendint(StringInfo buf, int i, int b);
|
|
extern void pq_sendint64(StringInfo buf, int64 i);
|
|
extern void pq_sendfloat4(StringInfo buf, float4 f);
|
|
extern void pq_sendfloat8(StringInfo buf, float8 f);
|
|
extern void pq_endmessage(StringInfo buf);
|
|
|
|
extern void pq_begintypsend(StringInfo buf);
|
|
extern bytea *pq_endtypsend(StringInfo buf);
|
|
|
|
extern void pq_puttextmessage(char msgtype, const char *str);
|
|
extern void pq_putemptymessage(char msgtype);
|
|
|
|
extern int pq_getmsgbyte(StringInfo msg);
|
|
extern unsigned int pq_getmsgint(StringInfo msg, int b);
|
|
extern int64 pq_getmsgint64(StringInfo msg);
|
|
extern float4 pq_getmsgfloat4(StringInfo msg);
|
|
extern float8 pq_getmsgfloat8(StringInfo msg);
|
|
extern const char *pq_getmsgbytes(StringInfo msg, int datalen);
|
|
extern void pq_copymsgbytes(StringInfo msg, char *buf, int datalen);
|
|
extern char *pq_getmsgtext(StringInfo msg, int rawbytes, int *nbytes);
|
|
extern const char *pq_getmsgstring(StringInfo msg);
|
|
extern const char *pq_getmsgrawstring(StringInfo msg);
|
|
extern void pq_getmsgend(StringInfo msg);
|
|
|
|
#endif /* PQFORMAT_H */
|