diff options
| author | Tom Lane | 2017-06-21 18:39:04 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-06-21 18:39:04 +0000 |
| commit | e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 (patch) | |
| tree | 8dc7df95c340803546152724fbc17aee4b8527f9 /src/port | |
| parent | 8ff6d4ec7840b0af56f1207073f44b7f2afae96d (diff) | |
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
Diffstat (limited to 'src/port')
| -rw-r--r-- | src/port/crypt.c | 3 | ||||
| -rw-r--r-- | src/port/dirmod.c | 2 | ||||
| -rw-r--r-- | src/port/getaddrinfo.c | 26 | ||||
| -rw-r--r-- | src/port/getopt.c | 2 | ||||
| -rw-r--r-- | src/port/getopt_long.c | 2 | ||||
| -rw-r--r-- | src/port/getrusage.c | 2 | ||||
| -rw-r--r-- | src/port/gettimeofday.c | 4 | ||||
| -rw-r--r-- | src/port/inet_aton.c | 10 | ||||
| -rw-r--r-- | src/port/mkdtemp.c | 2 | ||||
| -rw-r--r-- | src/port/thread.c | 8 | ||||
| -rw-r--r-- | src/port/win32error.c | 2 | ||||
| -rw-r--r-- | src/port/win32setlocale.c | 2 |
12 files changed, 34 insertions, 31 deletions
diff --git a/src/port/crypt.c b/src/port/crypt.c index 6a902ef0fc..9fc7abe10a 100644 --- a/src/port/crypt.c +++ b/src/port/crypt.c @@ -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; diff --git a/src/port/dirmod.c b/src/port/dirmod.c index bf34835941..98e74f25b0 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -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; diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c index c0e4b33e20..ff85db4b54 100644 --- a/src/port/getaddrinfo.c +++ b/src/port/getaddrinfo.c @@ -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) { diff --git a/src/port/getopt.c b/src/port/getopt.c index f1ad93d7d6..54c46ea366 100644 --- a/src/port/getopt.c +++ b/src/port/getopt.c @@ -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 */ diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c index aa5b7319fd..0f589d631b 100644 --- a/src/port/getopt_long.c +++ b/src/port/getopt_long.c @@ -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 */ diff --git a/src/port/getrusage.c b/src/port/getrusage.c index 71fce75722..2ef7e09967 100644 --- a/src/port/getrusage.c +++ b/src/port/getrusage.c @@ -28,7 +28,7 @@ */ int -getrusage(int who, struct rusage * rusage) +getrusage(int who, struct rusage *rusage) { #ifdef WIN32 FILETIME starttime; diff --git a/src/port/gettimeofday.c b/src/port/gettimeofday.c index af1157134b..f84d4e096a 100644 --- a/src/port/gettimeofday.c +++ b/src/port/gettimeofday.c @@ -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; diff --git a/src/port/inet_aton.c b/src/port/inet_aton.c index 27e8aaa4ec..68efd4723e 100644 --- a/src/port/inet_aton.c +++ b/src/port/inet_aton.c @@ -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); diff --git a/src/port/mkdtemp.c b/src/port/mkdtemp.c index f6316562e8..0aafb0d687 100644 --- a/src/port/mkdtemp.c +++ b/src/port/mkdtemp.c @@ -207,7 +207,7 @@ GETTEMP(char *path, int *doopen, int domkdir) if (isdigit((unsigned char) *trv)) *trv = 'a'; else - ++* trv; + ++*trv; break; } } diff --git a/src/port/thread.c b/src/port/thread.c index b54c871b00..a3f37b1237 100644 --- a/src/port/thread.c +++ b/src/port/thread.c @@ -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) diff --git a/src/port/win32error.c b/src/port/win32error.c index 40655962a8..fe07f6e0a2 100644 --- a/src/port/win32error.c +++ b/src/port/win32error.c @@ -21,7 +21,7 @@ static const struct { DWORD winerr; int doserr; -} doserrors[] = +} doserrors[] = { { diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c index cbf109836b..c4da4a8f92 100644 --- a/src/port/win32setlocale.c +++ b/src/port/win32setlocale.c @@ -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; |
