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
2025-11-26 23:43:30 +03:00 · 2017-06-21 14:39:04 -04:00
parent 8ff6d4ec78
commit e3860ffa4d
379 changed files with 1725 additions and 1707 deletions
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -92,8 +92,8 @@ static int	auth_peer(hbaPort *port);
 #define PGSQL_PAM_SERVICE "postgresql"	/* Service name passed to PAM */

 static int	CheckPAMAuth(Port *port, char *user, char *password);
-static int pam_passwd_conv_proc(int num_msg, const struct pam_message ** msg,
-					 struct pam_response ** resp, void *appdata_ptr);
+static int pam_passwd_conv_proc(int num_msg, const struct pam_message **msg,
+					 struct pam_response **resp, void *appdata_ptr);

 static struct pam_conv pam_passw_conv = {
 	&pam_passwd_conv_proc,
@@ -132,11 +132,11 @@ static int	CheckBSDAuth(Port *port, char *user);
 /* Correct header from the Platform SDK */
 typedef
 ULONG		(*__ldap_start_tls_sA) (
-												IN PLDAP ExternalHandle,
-												OUT PULONG ServerReturnValue,
-												OUT LDAPMessage **result,
-										   IN PLDAPControlA * ServerControls,
-											IN PLDAPControlA * ClientControls
+									IN PLDAP ExternalHandle,
+									OUT PULONG ServerReturnValue,
+									OUT LDAPMessage **result,
+									IN PLDAPControlA * ServerControls,
+									IN PLDAPControlA * ClientControls
 );
 #endif

@@ -182,7 +182,7 @@ static int	pg_GSS_recvauth(Port *port);
 #ifdef ENABLE_SSPI
 typedef SECURITY_STATUS
 			(WINAPI * QUERY_SECURITY_CONTEXT_TOKEN_FN) (
-													   PCtxtHandle, void **);
+														PCtxtHandle, void **);
 static int	pg_SSPI_recvauth(Port *port);
 static int pg_SSPI_make_upn(char *accountname,
 				 size_t accountnamesize,
@@ -1337,6 +1337,7 @@ pg_SSPI_recvauth(Port *port)
 	DWORD		domainnamesize = sizeof(domainname);
 	SID_NAME_USE accountnameuse;
 	HMODULE		secur32;
+
 	QUERY_SECURITY_CONTEXT_TOKEN_FN _QuerySecurityContextToken;

 	/*
@@ -2023,8 +2024,8 @@ auth_peer(hbaPort *port)
 */

 static int
-pam_passwd_conv_proc(int num_msg, const struct pam_message ** msg,
-					 struct pam_response ** resp, void *appdata_ptr)
+pam_passwd_conv_proc(int num_msg, const struct pam_message **msg,
+					 struct pam_response **resp, void *appdata_ptr)
 {
 	char	   *passwd;
 	struct pam_response *reply;
@@ -2919,7 +2920,7 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi
 	addrsize = sizeof(struct sockaddr_in);
 #endif

-	if (bind(sock, (struct sockaddr *) & localaddr, addrsize))
+	if (bind(sock, (struct sockaddr *) &localaddr, addrsize))
 	{
 		ereport(LOG,
 				(errmsg("could not bind local RADIUS socket: %m")));
@@ -3010,7 +3011,7 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi

 		addrsize = sizeof(remoteaddr);
 		packetlength = recvfrom(sock, receive_buffer, RADIUS_BUFFER_SIZE, 0,
-								(struct sockaddr *) & remoteaddr, &addrsize);
+								(struct sockaddr *) &remoteaddr, &addrsize);
 		if (packetlength < 0)
 		{
 			ereport(LOG,
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -766,7 +766,7 @@ lo_get_fragment_internal(Oid loOid, int64 offset, int32 nbytes)
 	LargeObjectDesc *loDesc;
 	int64		loSize;
 	int64		result_length;
-	int total_read PG_USED_FOR_ASSERTS_ONLY;
+	int			total_read PG_USED_FOR_ASSERTS_ONLY;
 	bytea	   *result = NULL;

 	/*
@@ -868,7 +868,7 @@ be_lo_from_bytea(PG_FUNCTION_ARGS)
 	Oid			loOid = PG_GETARG_OID(0);
 	bytea	   *str = PG_GETARG_BYTEA_PP(1);
 	LargeObjectDesc *loDesc;
-	int written PG_USED_FOR_ASSERTS_ONLY;
+	int			written PG_USED_FOR_ASSERTS_ONLY;

 	CreateFSContext();

@@ -891,7 +891,7 @@ be_lo_put(PG_FUNCTION_ARGS)
 	int64		offset = PG_GETARG_INT64(1);
 	bytea	   *str = PG_GETARG_BYTEA_PP(2);
 	LargeObjectDesc *loDesc;
-	int written PG_USED_FOR_ASSERTS_ONLY;
+	int			written PG_USED_FOR_ASSERTS_ONLY;

 	CreateFSContext();

--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -646,7 +646,7 @@ check_db(const char *dbname, const char *role, Oid roleid, List *tokens)
 }

 static bool
-ipv4eq(struct sockaddr_in * a, struct sockaddr_in * b)
+ipv4eq(struct sockaddr_in *a, struct sockaddr_in *b)
 {
 	return (a->sin_addr.s_addr == b->sin_addr.s_addr);
 }
@@ -654,7 +654,7 @@ ipv4eq(struct sockaddr_in * a, struct sockaddr_in * b)
 #ifdef HAVE_IPV6

 static bool
-ipv6eq(struct sockaddr_in6 * a, struct sockaddr_in6 * b)
+ipv6eq(struct sockaddr_in6 *a, struct sockaddr_in6 *b)
 {
 	int			i;

@@ -747,7 +747,7 @@ check_hostname(hbaPort *port, const char *hostname)
 			if (gai->ai_addr->sa_family == AF_INET)
 			{
 				if (ipv4eq((struct sockaddr_in *) gai->ai_addr,
-						   (struct sockaddr_in *) & port->raddr.addr))
+						   (struct sockaddr_in *) &port->raddr.addr))
 				{
 					found = true;
 					break;
@@ -757,7 +757,7 @@ check_hostname(hbaPort *port, const char *hostname)
 			else if (gai->ai_addr->sa_family == AF_INET6)
 			{
 				if (ipv6eq((struct sockaddr_in6 *) gai->ai_addr,
-						   (struct sockaddr_in6 *) & port->raddr.addr))
+						   (struct sockaddr_in6 *) &port->raddr.addr))
 				{
 					found = true;
 					break;
@@ -783,7 +783,7 @@ check_hostname(hbaPort *port, const char *hostname)
 * Check to see if a connecting IP matches the given address and netmask.
 */
 static bool
-check_ip(SockAddr *raddr, struct sockaddr * addr, struct sockaddr * mask)
+check_ip(SockAddr *raddr, struct sockaddr *addr, struct sockaddr *mask)
 {
 	if (raddr->addr.ss_family == addr->sa_family &&
 		pg_range_sockaddr(&raddr->addr,
@@ -797,7 +797,7 @@ check_ip(SockAddr *raddr, struct sockaddr * addr, struct sockaddr * mask)
 * pg_foreach_ifaddr callback: does client addr match this machine interface?
 */
 static void
-check_network_callback(struct sockaddr * addr, struct sockaddr * netmask,
+check_network_callback(struct sockaddr *addr, struct sockaddr *netmask,
 					   void *cb_data)
 {
 	check_network_data *cn = (check_network_data *) cb_data;
@@ -811,7 +811,7 @@ check_network_callback(struct sockaddr * addr, struct sockaddr * netmask,
 	{
 		/* Make an all-ones netmask of appropriate length for family */
 		pg_sockaddr_cidr_mask(&mask, NULL, addr->sa_family);
-		cn->result = check_ip(cn->raddr, addr, (struct sockaddr *) & mask);
+		cn->result = check_ip(cn->raddr, addr, (struct sockaddr *) &mask);
 	}
 	else
 	{
@@ -2041,8 +2041,8 @@ check_hba(hbaPort *port)
 					else
 					{
 						if (!check_ip(&port->raddr,
-									  (struct sockaddr *) & hba->addr,
-									  (struct sockaddr *) & hba->mask))
+									  (struct sockaddr *) &hba->addr,
+									  (struct sockaddr *) &hba->mask))
 							continue;
 					}
 					break;
--- a/src/backend/libpq/ifaddr.c
+++ b/src/backend/libpq/ifaddr.c
@@ -32,14 +32,14 @@

 #include "libpq/ifaddr.h"

-static int range_sockaddr_AF_INET(const struct sockaddr_in * addr,
-					   const struct sockaddr_in * netaddr,
-					   const struct sockaddr_in * netmask);
+static int range_sockaddr_AF_INET(const struct sockaddr_in *addr,
+					   const struct sockaddr_in *netaddr,
+					   const struct sockaddr_in *netmask);

 #ifdef HAVE_IPV6
-static int range_sockaddr_AF_INET6(const struct sockaddr_in6 * addr,
-						const struct sockaddr_in6 * netaddr,
-						const struct sockaddr_in6 * netmask);
+static int range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr,
+						const struct sockaddr_in6 *netaddr,
+						const struct sockaddr_in6 *netmask);
 #endif


@@ -50,9 +50,9 @@ static int range_sockaddr_AF_INET6(const struct sockaddr_in6 * addr,
 * in the same address family; and AF_UNIX addresses are not supported.
 */
 int
-pg_range_sockaddr(const struct sockaddr_storage * addr,
-				  const struct sockaddr_storage * netaddr,
-				  const struct sockaddr_storage * netmask)
+pg_range_sockaddr(const struct sockaddr_storage *addr,
+				  const struct sockaddr_storage *netaddr,
+				  const struct sockaddr_storage *netmask)
 {
 	if (addr->ss_family == AF_INET)
 		return range_sockaddr_AF_INET((const struct sockaddr_in *) addr,
@@ -69,9 +69,9 @@ pg_range_sockaddr(const struct sockaddr_storage * addr,
 }

 static int
-range_sockaddr_AF_INET(const struct sockaddr_in * addr,
-					   const struct sockaddr_in * netaddr,
-					   const struct sockaddr_in * netmask)
+range_sockaddr_AF_INET(const struct sockaddr_in *addr,
+					   const struct sockaddr_in *netaddr,
+					   const struct sockaddr_in *netmask)
 {
 	if (((addr->sin_addr.s_addr ^ netaddr->sin_addr.s_addr) &
 		 netmask->sin_addr.s_addr) == 0)
@@ -84,9 +84,9 @@ range_sockaddr_AF_INET(const struct sockaddr_in * addr,
 #ifdef HAVE_IPV6

 static int
-range_sockaddr_AF_INET6(const struct sockaddr_in6 * addr,
-						const struct sockaddr_in6 * netaddr,
-						const struct sockaddr_in6 * netmask)
+range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr,
+						const struct sockaddr_in6 *netaddr,
+						const struct sockaddr_in6 *netmask)
 {
 	int			i;

@@ -112,7 +112,7 @@ range_sockaddr_AF_INET6(const struct sockaddr_in6 * addr,
 * Return value is 0 if okay, -1 if not.
 */
 int
-pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family)
+pg_sockaddr_cidr_mask(struct sockaddr_storage *mask, char *numbits, int family)
 {
 	long		bits;
 	char	   *endptr;
@@ -190,7 +190,7 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family)
 */
 static void
 run_ifaddr_callback(PgIfAddrCallback callback, void *cb_data,
-					struct sockaddr * addr, struct sockaddr * mask)
+					struct sockaddr *addr, struct sockaddr *mask)
 {
 	struct sockaddr_storage fullmask;

@@ -222,7 +222,7 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *cb_data,
 	if (!mask)
 	{
 		pg_sockaddr_cidr_mask(&fullmask, NULL, addr->sa_family);
-		mask = (struct sockaddr *) & fullmask;
+		mask = (struct sockaddr *) &fullmask;
 	}

 	(*callback) (addr, mask, cb_data);
@@ -284,8 +284,8 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)

 	for (i = 0; i < length / sizeof(INTERFACE_INFO); ++i)
 		run_ifaddr_callback(callback, cb_data,
-							(struct sockaddr *) & ii[i].iiAddress,
-							(struct sockaddr *) & ii[i].iiNetmask);
+							(struct sockaddr *) &ii[i].iiAddress,
+							(struct sockaddr *) &ii[i].iiNetmask);

 	closesocket(sock);
 	free(ii);
@@ -425,7 +425,7 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
 	lifr = lifc.lifc_req;
 	for (i = 0; i < total; ++i)
 	{
-		addr = (struct sockaddr *) & lifr[i].lifr_addr;
+		addr = (struct sockaddr *) &lifr[i].lifr_addr;
 		memcpy(&lmask, &lifr[i], sizeof(struct lifreq));
 #ifdef HAVE_IPV6
 		fd = (addr->sa_family == AF_INET6) ? sock6 : sock;
@@ -435,7 +435,7 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
 		if (ioctl(fd, SIOCGLIFNETMASK, &lmask) < 0)
 			mask = NULL;
 		else
-			mask = (struct sockaddr *) & lmask.lifr_addr;
+			mask = (struct sockaddr *) &lmask.lifr_addr;
 		run_ifaddr_callback(callback, cb_data, addr, mask);
 	}

@@ -572,8 +572,8 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
 	memset(&mask, 0, sizeof(mask));
 	pg_sockaddr_cidr_mask(&mask, "8", AF_INET);
 	run_ifaddr_callback(callback, cb_data,
-						(struct sockaddr *) & addr,
-						(struct sockaddr *) & mask);
+						(struct sockaddr *) &addr,
+						(struct sockaddr *) &mask);

 #ifdef HAVE_IPV6
 	/* addr ::1/128 */
@@ -583,8 +583,8 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
 	memset(&mask, 0, sizeof(mask));
 	pg_sockaddr_cidr_mask(&mask, "128", AF_INET6);
 	run_ifaddr_callback(callback, cb_data,
-						(struct sockaddr *) & addr6,
-						(struct sockaddr *) & mask);
+						(struct sockaddr *) &addr6,
+						(struct sockaddr *) &mask);
 #endif

 	return 0;
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -699,7 +699,7 @@ StreamConnection(pgsocket server_fd, Port *port)
 	/* accept connection and fill in the client (remote) address */
 	port->raddr.salen = sizeof(port->raddr.addr);
 	if ((port->sock = accept(server_fd,
-							 (struct sockaddr *) & port->raddr.addr,
+							 (struct sockaddr *) &port->raddr.addr,
 							 &port->raddr.salen)) == PGINVALID_SOCKET)
 	{
 		ereport(LOG,
@@ -720,7 +720,7 @@ StreamConnection(pgsocket server_fd, Port *port)
 	/* fill in the server (local) address */
 	port->laddr.salen = sizeof(port->laddr.addr);
 	if (getsockname(port->sock,
-					(struct sockaddr *) & port->laddr.addr,
+					(struct sockaddr *) &port->laddr.addr,
 					&port->laddr.salen) < 0)
 	{
 		elog(LOG, "getsockname() failed: %m");
@@ -1573,7 +1573,7 @@ fail:
 static void
 socket_putmessage_noblock(char msgtype, const char *s, size_t len)
 {
-	int res		PG_USED_FOR_ASSERTS_ONLY;
+	int			res PG_USED_FOR_ASSERTS_ONLY;
 	int			required;

 	/*