mirror of
https://github.com/postgres/postgres.git
synced 2025-12-04 12:02:48 +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:
@@ -307,6 +307,7 @@ unsigned char *cp;
|
||||
C_block *out;
|
||||
C_block *p;
|
||||
int chars_in;
|
||||
|
||||
{
|
||||
DCL_BLOCK(D, D0, D1);
|
||||
C_block *tp;
|
||||
@@ -977,6 +978,7 @@ C_block perm[64 / CHUNKBITS][1 << CHUNKBITS];
|
||||
unsigned char p[64];
|
||||
int chars_in,
|
||||
chars_out;
|
||||
|
||||
{
|
||||
int i,
|
||||
j,
|
||||
@@ -1068,6 +1070,7 @@ prtab(s, t, num_rows)
|
||||
char *s;
|
||||
unsigned char *t;
|
||||
int num_rows;
|
||||
|
||||
{
|
||||
int i,
|
||||
j;
|
||||
|
||||
@@ -365,7 +365,7 @@ pgwin32_is_junction(const char *path)
|
||||
* to update this field.
|
||||
*/
|
||||
int
|
||||
pgwin32_safestat(const char *path, struct stat * buf)
|
||||
pgwin32_safestat(const char *path, struct stat *buf)
|
||||
{
|
||||
int r;
|
||||
WIN32_FILE_ATTRIBUTE_DATA attr;
|
||||
|
||||
@@ -40,17 +40,17 @@
|
||||
* Here we need to declare what the function pointers look like
|
||||
*/
|
||||
typedef int (__stdcall * getaddrinfo_ptr_t) (const char *nodename,
|
||||
const char *servname,
|
||||
const struct addrinfo * hints,
|
||||
struct addrinfo ** res);
|
||||
const char *servname,
|
||||
const struct addrinfo *hints,
|
||||
struct addrinfo **res);
|
||||
|
||||
typedef void (__stdcall * freeaddrinfo_ptr_t) (struct addrinfo * ai);
|
||||
typedef void (__stdcall * freeaddrinfo_ptr_t) (struct addrinfo *ai);
|
||||
|
||||
typedef int (__stdcall * getnameinfo_ptr_t) (const struct sockaddr * sa,
|
||||
int salen,
|
||||
char *host, int hostlen,
|
||||
char *serv, int servlen,
|
||||
int flags);
|
||||
typedef int (__stdcall * getnameinfo_ptr_t) (const struct sockaddr *sa,
|
||||
int salen,
|
||||
char *host, int hostlen,
|
||||
char *serv, int servlen,
|
||||
int flags);
|
||||
|
||||
/* static pointers to the native routines, so we only do the lookup once. */
|
||||
static getaddrinfo_ptr_t getaddrinfo_ptr = NULL;
|
||||
@@ -135,8 +135,8 @@ haveNativeWindowsIPv6routines(void)
|
||||
*/
|
||||
int
|
||||
getaddrinfo(const char *node, const char *service,
|
||||
const struct addrinfo * hintp,
|
||||
struct addrinfo ** res)
|
||||
const struct addrinfo *hintp,
|
||||
struct addrinfo **res)
|
||||
{
|
||||
struct addrinfo *ai;
|
||||
struct sockaddr_in sin,
|
||||
@@ -262,7 +262,7 @@ getaddrinfo(const char *node, const char *service,
|
||||
|
||||
|
||||
void
|
||||
freeaddrinfo(struct addrinfo * res)
|
||||
freeaddrinfo(struct addrinfo *res)
|
||||
{
|
||||
if (res)
|
||||
{
|
||||
@@ -354,7 +354,7 @@ gai_strerror(int errcode)
|
||||
* - No IPv6 support.
|
||||
*/
|
||||
int
|
||||
getnameinfo(const struct sockaddr * sa, int salen,
|
||||
getnameinfo(const struct sockaddr *sa, int salen,
|
||||
char *node, int nodelen,
|
||||
char *service, int servicelen, int flags)
|
||||
{
|
||||
|
||||
@@ -69,7 +69,7 @@ char *optarg; /* argument associated with option */
|
||||
* returning -1.)
|
||||
*/
|
||||
int
|
||||
getopt(int nargc, char *const * nargv, const char *ostr)
|
||||
getopt(int nargc, char *const *nargv, const char *ostr)
|
||||
{
|
||||
static char *place = EMSG; /* option letter processing */
|
||||
char *oli; /* option letter list index */
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
int
|
||||
getopt_long(int argc, char *const argv[],
|
||||
const char *optstring,
|
||||
const struct option * longopts, int *longindex)
|
||||
const struct option *longopts, int *longindex)
|
||||
{
|
||||
static char *place = EMSG; /* option letter processing */
|
||||
char *oli; /* option letter list index */
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
*/
|
||||
|
||||
int
|
||||
getrusage(int who, struct rusage * rusage)
|
||||
getrusage(int who, struct rusage *rusage)
|
||||
{
|
||||
#ifdef WIN32
|
||||
FILETIME starttime;
|
||||
|
||||
@@ -45,7 +45,7 @@ static const unsigned __int64 epoch = UINT64CONST(116444736000000000);
|
||||
* signature, so we can just store a pointer to whichever we find. This
|
||||
* is the pointer's type.
|
||||
*/
|
||||
typedef VOID(WINAPI * PgGetSystemTimeFn) (LPFILETIME);
|
||||
typedef VOID(WINAPI * PgGetSystemTimeFn) (LPFILETIME);
|
||||
|
||||
/* One-time initializer function, must match that signature. */
|
||||
static void WINAPI init_gettimeofday(LPFILETIME lpSystemTimeAsFileTime);
|
||||
@@ -102,7 +102,7 @@ init_gettimeofday(LPFILETIME lpSystemTimeAsFileTime)
|
||||
* elapsed_time().
|
||||
*/
|
||||
int
|
||||
gettimeofday(struct timeval * tp, struct timezone * tzp)
|
||||
gettimeofday(struct timeval *tp, struct timezone *tzp)
|
||||
{
|
||||
FILETIME file_time;
|
||||
ULARGE_INTEGER ularge;
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
* cannot distinguish between failure and a local broadcast address.
|
||||
*/
|
||||
int
|
||||
inet_aton(const char *cp, struct in_addr * addr)
|
||||
inet_aton(const char *cp, struct in_addr *addr)
|
||||
{
|
||||
unsigned int val;
|
||||
int base,
|
||||
@@ -120,22 +120,22 @@ inet_aton(const char *cp, struct in_addr * addr)
|
||||
switch (n)
|
||||
{
|
||||
|
||||
case 1: /* a -- 32 bits */
|
||||
case 1: /* a -- 32 bits */
|
||||
break;
|
||||
|
||||
case 2: /* a.b -- 8.24 bits */
|
||||
case 2: /* a.b -- 8.24 bits */
|
||||
if (val > 0xffffff)
|
||||
return 0;
|
||||
val |= parts[0] << 24;
|
||||
break;
|
||||
|
||||
case 3: /* a.b.c -- 8.8.16 bits */
|
||||
case 3: /* a.b.c -- 8.8.16 bits */
|
||||
if (val > 0xffff)
|
||||
return 0;
|
||||
val |= (parts[0] << 24) | (parts[1] << 16);
|
||||
break;
|
||||
|
||||
case 4: /* a.b.c.d -- 8.8.8.8 bits */
|
||||
case 4: /* a.b.c.d -- 8.8.8.8 bits */
|
||||
if (val > 0xff)
|
||||
return 0;
|
||||
val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
|
||||
|
||||
@@ -207,7 +207,7 @@ GETTEMP(char *path, int *doopen, int domkdir)
|
||||
if (isdigit((unsigned char) *trv))
|
||||
*trv = 'a';
|
||||
else
|
||||
++* trv;
|
||||
++*trv;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,8 +92,8 @@ pqStrerror(int errnum, char *strerrbuf, size_t buflen)
|
||||
*/
|
||||
#ifndef WIN32
|
||||
int
|
||||
pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer,
|
||||
size_t buflen, struct passwd ** result)
|
||||
pqGetpwuid(uid_t uid, struct passwd *resultbuf, char *buffer,
|
||||
size_t buflen, struct passwd **result)
|
||||
{
|
||||
#if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(HAVE_GETPWUID_R)
|
||||
return getpwuid_r(uid, resultbuf, buffer, buflen, result);
|
||||
@@ -115,9 +115,9 @@ pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer,
|
||||
#ifndef HAVE_GETADDRINFO
|
||||
int
|
||||
pqGethostbyname(const char *name,
|
||||
struct hostent * resultbuf,
|
||||
struct hostent *resultbuf,
|
||||
char *buffer, size_t buflen,
|
||||
struct hostent ** result,
|
||||
struct hostent **result,
|
||||
int *herrno)
|
||||
{
|
||||
#if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(HAVE_GETHOSTBYNAME_R)
|
||||
|
||||
@@ -21,7 +21,7 @@ static const struct
|
||||
{
|
||||
DWORD winerr;
|
||||
int doserr;
|
||||
} doserrors[] =
|
||||
} doserrors[] =
|
||||
|
||||
{
|
||||
{
|
||||
|
||||
@@ -104,7 +104,7 @@ static const struct locale_map locale_map_result[] = {
|
||||
#define MAX_LOCALE_NAME_LEN 100
|
||||
|
||||
static const char *
|
||||
map_locale(const struct locale_map * map, const char *locale)
|
||||
map_locale(const struct locale_map *map, const char *locale)
|
||||
{
|
||||
static char aliasbuf[MAX_LOCALE_NAME_LEN];
|
||||
int i;
|
||||
|
||||
Reference in New Issue
Block a user