1
0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +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:
Tom Lane
2017-06-21 14:39:04 -04:00
parent 8ff6d4ec78
commit e3860ffa4d
379 changed files with 1725 additions and 1707 deletions

View File

@@ -349,8 +349,8 @@ static int uri_prefix_length(const char *connstr);
static bool recognized_connection_string(const char *connstr);
static PQconninfoOption *conninfo_parse(const char *conninfo,
PQExpBuffer errorMessage, bool use_defaults);
static PQconninfoOption *conninfo_array_parse(const char *const * keywords,
const char *const * values, PQExpBuffer errorMessage,
static PQconninfoOption *conninfo_array_parse(const char *const *keywords,
const char *const *values, PQExpBuffer errorMessage,
bool use_defaults, int expand_dbname);
static bool conninfo_add_defaults(PQconninfoOption *options,
PQExpBuffer errorMessage);
@@ -507,8 +507,8 @@ pqDropConnection(PGconn *conn, bool flushInput)
* call succeeded.
*/
PGconn *
PQconnectdbParams(const char *const * keywords,
const char *const * values,
PQconnectdbParams(const char *const *keywords,
const char *const *values,
int expand_dbname)
{
PGconn *conn = PQconnectStartParams(keywords, values, expand_dbname);
@@ -526,8 +526,8 @@ PQconnectdbParams(const char *const * keywords,
* check server status, accepting parameters identical to PQconnectdbParams
*/
PGPing
PQpingParams(const char *const * keywords,
const char *const * values,
PQpingParams(const char *const *keywords,
const char *const *values,
int expand_dbname)
{
PGconn *conn = PQconnectStartParams(keywords, values, expand_dbname);
@@ -610,8 +610,8 @@ PQping(const char *conninfo)
* See PQconnectPoll for more info.
*/
PGconn *
PQconnectStartParams(const char *const * keywords,
const char *const * values,
PQconnectStartParams(const char *const *keywords,
const char *const *values,
int expand_dbname)
{
PGconn *conn;
@@ -2280,7 +2280,7 @@ keep_going: /* We will come back to here until there is
/* Fill in the client address */
conn->laddr.salen = sizeof(conn->laddr.addr);
if (getsockname(conn->sock,
(struct sockaddr *) & conn->laddr.addr,
(struct sockaddr *) &conn->laddr.addr,
&conn->laddr.salen) < 0)
{
appendPQExpBuffer(&conn->errorMessage,
@@ -3740,7 +3740,7 @@ internal_cancel(SockAddr *raddr, int be_pid, int be_key,
goto cancel_errReturn;
}
retry3:
if (connect(tmpsock, (struct sockaddr *) & raddr->addr,
if (connect(tmpsock, (struct sockaddr *) &raddr->addr,
raddr->salen) < 0)
{
if (SOCK_ERRNO == EINTR)
@@ -4926,7 +4926,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage,
* a database, in-tree code first wraps the name in a connection string.
*/
static PQconninfoOption *
conninfo_array_parse(const char *const * keywords, const char *const * values,
conninfo_array_parse(const char *const *keywords, const char *const *values,
PQExpBuffer errorMessage, bool use_defaults,
int expand_dbname)
{

View File

@@ -58,7 +58,7 @@ static int PQsendQueryGuts(PGconn *conn,
const char *stmtName,
int nParams,
const Oid *paramTypes,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat);
@@ -940,7 +940,7 @@ pqSaveParameterStatus(PGconn *conn, const char *name, const char *value)
* Store new info as a single malloc block
*/
pstatus = (pgParameterStatus *) malloc(sizeof(pgParameterStatus) +
strlen(name) +strlen(value) + 2);
strlen(name) + strlen(value) + 2);
if (pstatus)
{
char *ptr;
@@ -1184,7 +1184,7 @@ PQsendQueryParams(PGconn *conn,
const char *command,
int nParams,
const Oid *paramTypes,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat)
@@ -1325,7 +1325,7 @@ int
PQsendQueryPrepared(PGconn *conn,
const char *stmtName,
int nParams,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat)
@@ -1408,7 +1408,7 @@ PQsendQueryGuts(PGconn *conn,
const char *stmtName,
int nParams,
const Oid *paramTypes,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat)
@@ -1861,7 +1861,7 @@ PQexecParams(PGconn *conn,
const char *command,
int nParams,
const Oid *paramTypes,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat)
@@ -1907,7 +1907,7 @@ PGresult *
PQexecPrepared(PGconn *conn,
const char *stmtName,
int nParams,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat)

View File

@@ -326,7 +326,7 @@ static void
do_field(const PQprintOpt *po, const PGresult *res,
const int i, const int j, const int fs_len,
char **fields,
const int nFields, char const ** fieldNames,
const int nFields, char const **fieldNames,
unsigned char *fieldNotNum, int *fieldMax,
const int fieldMaxLen, FILE *fout)
{

View File

@@ -909,7 +909,7 @@ initialize_SSL(PGconn *conn)
!(conn->sslrootcert && strlen(conn->sslrootcert) > 0) ||
!(conn->sslcrl && strlen(conn->sslcrl) > 0))
have_homedir = pqGetHomeDirectory(homedir, sizeof(homedir));
else /* won't need it */
else /* won't need it */
have_homedir = false;
/*

View File

@@ -19,7 +19,7 @@
#include "libpq-fe.h"
#ifdef __cplusplus
extern "C"
extern "C"
{
#endif

View File

@@ -16,7 +16,7 @@
#define LIBPQ_FE_H
#ifdef __cplusplus
extern "C"
extern "C"
{
#endif
@@ -253,14 +253,14 @@ typedef struct pgresAttDesc
/* make a new client connection to the backend */
/* Asynchronous (non-blocking) */
extern PGconn *PQconnectStart(const char *conninfo);
extern PGconn *PQconnectStartParams(const char *const * keywords,
const char *const * values, int expand_dbname);
extern PGconn *PQconnectStartParams(const char *const *keywords,
const char *const *values, int expand_dbname);
extern PostgresPollingStatusType PQconnectPoll(PGconn *conn);
/* Synchronous (blocking) */
extern PGconn *PQconnectdb(const char *conninfo);
extern PGconn *PQconnectdbParams(const char *const * keywords,
const char *const * values, int expand_dbname);
extern PGconn *PQconnectdbParams(const char *const *keywords,
const char *const *values, int expand_dbname);
extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport,
const char *pgoptions, const char *pgtty,
const char *dbName,
@@ -333,7 +333,7 @@ extern int PQsetClientEncoding(PGconn *conn, const char *encoding);
extern int PQsslInUse(PGconn *conn);
extern void *PQsslStruct(PGconn *conn, const char *struct_name);
extern const char *PQsslAttribute(PGconn *conn, const char *attribute_name);
extern const char *const * PQsslAttributeNames(PGconn *conn);
extern const char *const *PQsslAttributeNames(PGconn *conn);
/* Get the OpenSSL structure associated with a connection. Returns NULL for
* unencrypted connections or if any other TLS library is in use. */
@@ -383,7 +383,7 @@ extern PGresult *PQexecParams(PGconn *conn,
const char *command,
int nParams,
const Oid *paramTypes,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat);
@@ -393,7 +393,7 @@ extern PGresult *PQprepare(PGconn *conn, const char *stmtName,
extern PGresult *PQexecPrepared(PGconn *conn,
const char *stmtName,
int nParams,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat);
@@ -404,7 +404,7 @@ extern int PQsendQueryParams(PGconn *conn,
const char *command,
int nParams,
const Oid *paramTypes,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat);
@@ -414,7 +414,7 @@ extern int PQsendPrepare(PGconn *conn, const char *stmtName,
extern int PQsendQueryPrepared(PGconn *conn,
const char *stmtName,
int nParams,
const char *const * paramValues,
const char *const *paramValues,
const int *paramLengths,
const int *paramFormats,
int resultFormat);
@@ -445,8 +445,8 @@ extern int PQsetnonblocking(PGconn *conn, int arg);
extern int PQisnonblocking(const PGconn *conn);
extern int PQisthreadsafe(void);
extern PGPing PQping(const char *conninfo);
extern PGPing PQpingParams(const char *const * keywords,
const char *const * values, int expand_dbname);
extern PGPing PQpingParams(const char *const *keywords,
const char *const *values, int expand_dbname);
/* Force the write buffer to be written (or at least try) */
extern int PQflush(PGconn *conn);

View File

@@ -44,7 +44,7 @@ static struct WSErrorEntry
{
DWORD error;
const char *description;
} WSErrors[] =
} WSErrors[] =
{
{
@@ -236,7 +236,7 @@ struct MessageDLL
const char *dll_name;
void *handle;
int loaded; /* BOOL */
} dlls[] =
} dlls[] =
{
{