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:
@@ -187,7 +187,7 @@ find_my_exec(const char *argv0, char *retpath)
|
||||
|
||||
switch (validate_exec(retpath))
|
||||
{
|
||||
case 0: /* found ok */
|
||||
case 0: /* found ok */
|
||||
return resolve_symlinks(retpath);
|
||||
case -1: /* wasn't even a candidate, keep looking */
|
||||
break;
|
||||
@@ -683,7 +683,7 @@ AddUserToTokenDacl(HANDLE hToken)
|
||||
|
||||
/* Figure out the size of the new ACL */
|
||||
dwNewAclSize = asi.AclBytesInUse + sizeof(ACCESS_ALLOWED_ACE) +
|
||||
GetLengthSid(pTokenUser->User.Sid) -sizeof(DWORD);
|
||||
GetLengthSid(pTokenUser->User.Sid) - sizeof(DWORD);
|
||||
|
||||
/* Allocate the ACL buffer & initialize it */
|
||||
pacl = (PACL) LocalAlloc(LPTR, dwNewAclSize);
|
||||
|
@@ -40,10 +40,10 @@
|
||||
|
||||
#ifdef HAVE_UNIX_SOCKETS
|
||||
static int getaddrinfo_unix(const char *path,
|
||||
const struct addrinfo * hintsp,
|
||||
struct addrinfo ** result);
|
||||
const struct addrinfo *hintsp,
|
||||
struct addrinfo **result);
|
||||
|
||||
static int getnameinfo_unix(const struct sockaddr_un * sa, int salen,
|
||||
static int getnameinfo_unix(const struct sockaddr_un *sa, int salen,
|
||||
char *node, int nodelen,
|
||||
char *service, int servicelen,
|
||||
int flags);
|
||||
@@ -55,7 +55,7 @@ static int getnameinfo_unix(const struct sockaddr_un * sa, int salen,
|
||||
*/
|
||||
int
|
||||
pg_getaddrinfo_all(const char *hostname, const char *servname,
|
||||
const struct addrinfo * hintp, struct addrinfo ** result)
|
||||
const struct addrinfo *hintp, struct addrinfo **result)
|
||||
{
|
||||
int rc;
|
||||
|
||||
@@ -85,7 +85,7 @@ pg_getaddrinfo_all(const char *hostname, const char *servname,
|
||||
* not safe to look at ai_family in the addrinfo itself.
|
||||
*/
|
||||
void
|
||||
pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai)
|
||||
pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo *ai)
|
||||
{
|
||||
#ifdef HAVE_UNIX_SOCKETS
|
||||
if (hint_ai_family == AF_UNIX)
|
||||
@@ -119,7 +119,7 @@ pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai)
|
||||
* guaranteed to be filled with something even on failure return.
|
||||
*/
|
||||
int
|
||||
pg_getnameinfo_all(const struct sockaddr_storage * addr, int salen,
|
||||
pg_getnameinfo_all(const struct sockaddr_storage *addr, int salen,
|
||||
char *node, int nodelen,
|
||||
char *service, int servicelen,
|
||||
int flags)
|
||||
@@ -162,8 +162,8 @@ pg_getnameinfo_all(const struct sockaddr_storage * addr, int salen,
|
||||
* -------
|
||||
*/
|
||||
static int
|
||||
getaddrinfo_unix(const char *path, const struct addrinfo * hintsp,
|
||||
struct addrinfo ** result)
|
||||
getaddrinfo_unix(const char *path, const struct addrinfo *hintsp,
|
||||
struct addrinfo **result)
|
||||
{
|
||||
struct addrinfo hints;
|
||||
struct addrinfo *aip;
|
||||
@@ -228,7 +228,7 @@ getaddrinfo_unix(const char *path, const struct addrinfo * hintsp,
|
||||
* Convert an address to a hostname.
|
||||
*/
|
||||
static int
|
||||
getnameinfo_unix(const struct sockaddr_un * sa, int salen,
|
||||
getnameinfo_unix(const struct sockaddr_un *sa, int salen,
|
||||
char *node, int nodelen,
|
||||
char *service, int servicelen,
|
||||
int flags)
|
||||
|
@@ -56,7 +56,7 @@ pg_wcscmp(const pg_wchar *s1, const pg_wchar *s2)
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
const pg_unicode_test *test;
|
||||
const pg_unicode_test *test;
|
||||
|
||||
for (test = UnicodeNormalizationTests; test->input[0] != 0; test++)
|
||||
{
|
||||
|
Reference in New Issue
Block a user