From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 9 Jun 2017 20:04:23 +0000 (-0400)
Subject: Comma comma comma comma
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=748b844e737acfb5a9218bb6efd16b9ba9be03e0;p=thirdparty%2Ffreeradius-server.git

Comma comma comma comma
---

diff --git a/redhat/openssl/ectest.c b/redhat/openssl/ectest.c
index 921edcdb2af..d75c7671cd1 100644
--- a/redhat/openssl/ectest.c
+++ b/redhat/openssl/ectest.c
@@ -419,7 +419,7 @@ static void prime_field_tests(void)
 		if (!BN_add(y, z, BN_value_one())) ABORT;
 		if (BN_is_odd(y)) ABORT;
 		if (!BN_rshift1(y, y)) ABORT;
-		scalars[0] = y; /* (group order + 1)/2,  so  y*Q + y*Q = Q */
+		scalars[0] = y; /* (group order + 1)/2, so  y*Q + y*Q = Q */
 		scalars[1] = y;
 
 		fprintf(stdout, "combined multiplication ...");
diff --git a/src/include/debug.h b/src/include/debug.h
index e9dd33c7f50..fc303ed56fa 100644
--- a/src/include/debug.h
+++ b/src/include/debug.h
@@ -85,11 +85,11 @@ bool		fr_cond_assert_fail(char const *file, int line, char const *expr);
  *
  * @param _x expression to test (should evaluate to true)
  */
-#define		fr_cond_assert(_x) (bool)((_x) ? true : (fr_cond_assert_fail(__FILE__,  __LINE__, #_x) && false))
+#define		fr_cond_assert(_x) (bool)((_x) ? true : (fr_cond_assert_fail(__FILE__, __LINE__, #_x) && false))
 
 void		NEVER_RETURNS _fr_exit(char const *file, int line, int status);
-#  define	fr_exit(_x) _fr_exit(__FILE__,  __LINE__, (_x))
+#  define	fr_exit(_x) _fr_exit(__FILE__, __LINE__, (_x))
 
 void		NEVER_RETURNS _fr_exit_now(char const *file, int line, int status);
-#  define	fr_exit_now(_x) _fr_exit_now(__FILE__,  __LINE__, (_x))
+#  define	fr_exit_now(_x) _fr_exit_now(__FILE__, __LINE__, (_x))
 #endif /* _FR_DEBUG_H */
diff --git a/src/include/dict.h b/src/include/dict.h
index ae7a0e1cc15..5663f0e101a 100644
--- a/src/include/dict.h
+++ b/src/include/dict.h
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 #ifdef WITH_VERIFY_PTR
-#  define VERIFY_DA(_x)		fr_dict_verify(__FILE__,  __LINE__, _x)
+#  define VERIFY_DA(_x)		fr_dict_verify(__FILE__, __LINE__, _x)
 #else
 #  define VERIFY_DA(_x)		fr_cond_assert(_x)
 #endif
diff --git a/src/include/log.h b/src/include/log.h
index 87396883886..7dbbdebd675 100644
--- a/src/include/log.h
+++ b/src/include/log.h
@@ -134,7 +134,7 @@ void	radlog_fatal(char const *fmt, ...) CC_HINT(format (printf, 1, 2)) CC_HINT(n
 #define ACCT(fmt, ...)		_FR_LOG(L_ACCT, fmt, ## __VA_ARGS__)
 #define PROXY(fmt, ...)		_FR_LOG(L_PROXY, fmt, ## __VA_ARGS__)
 
-#define INFO(fmt, ...)		_FR_LOG(L_INFO,  fmt, ## __VA_ARGS__)
+#define INFO(fmt, ...)		_FR_LOG(L_INFO, fmt, ## __VA_ARGS__)
 #define WARN(fmt, ...)		_FR_LOG(L_WARN, fmt, ## __VA_ARGS__)
 #define ERROR(fmt, ...)		_FR_LOG(L_ERR, fmt, ## __VA_ARGS__)
 #define PERROR(fmt, ...)	_FR_LOG_PERROR(L_ERR, fmt, ## __VA_ARGS__)
diff --git a/src/include/pair.h b/src/include/pair.h
index 58e94f7a0cd..b40f653d429 100644
--- a/src/include/pair.h
+++ b/src/include/pair.h
@@ -32,8 +32,8 @@ extern "C" {
 #endif
 
 #ifdef WITH_VERIFY_PTR
-#  define VERIFY_VP(_x)		fr_pair_verify(__FILE__,  __LINE__, _x)
-#  define VERIFY_LIST(_x)	fr_pair_list_verify(__FILE__,  __LINE__, NULL, _x)
+#  define VERIFY_VP(_x)		fr_pair_verify(__FILE__, __LINE__, _x)
+#  define VERIFY_LIST(_x)	fr_pair_list_verify(__FILE__, __LINE__, NULL, _x)
 #  define VERIFY_PACKET(_x)	(void) talloc_get_type_abort(_x, RADIUS_PACKET)
 #else
 /*
diff --git a/src/include/proto.h b/src/include/proto.h
index 191f48450dd..41417a25dd2 100644
--- a/src/include/proto.h
+++ b/src/include/proto.h
@@ -35,7 +35,7 @@ extern "C" {
 #ifndef NDEBUG
 #  define FR_PROTO_TRACE(_x, ...)	if (fr_log_fp && (fr_debug_lvl > 3)) fr_proto_print(__FILE__, __LINE__, _x, ## __VA_ARGS__)
 #  define FR_PROTO_HEX_DUMP(_x, _y, _z)	if (fr_log_fp && (fr_debug_lvl > 3)) fr_proto_print_hex_data(__FILE__, __LINE__, _x, _y, _z)
-#  define FR_PROTO_STACK_PRINT(_x, _y)	if (fr_log_fp && (fr_debug_lvl > 3)) fr_proto_tlv_stack_print( __FILE__,  __LINE__, __FUNCTION__, _x, _y)
+#  define FR_PROTO_STACK_PRINT(_x, _y)	if (fr_log_fp && (fr_debug_lvl > 3)) fr_proto_tlv_stack_print( __FILE__, __LINE__, __FUNCTION__, _x, _y)
 #else
 #  define FR_PROTO_TRACE(_x, ...)
 #  define FR_PROTO_HEX_DUMP(_x, _y, _z)
diff --git a/src/include/rad_assert.h b/src/include/rad_assert.h
index c7ee6bf5ac7..ec9dce7385e 100644
--- a/src/include/rad_assert.h
+++ b/src/include/rad_assert.h
@@ -58,7 +58,7 @@ bool fr_assert_fail(char const *file, unsigned int line, char const *expr);
 /** Use for conditions that should result in an assert in dev builds, and return in non-dev builds
  *
  */
-#define rad_cond_assert(_x) (bool)((_x) ? true : (fr_assert_fail(__FILE__,  __LINE__, #_x) && false))
+#define rad_cond_assert(_x) (bool)((_x) ? true : (fr_assert_fail(__FILE__, __LINE__, #_x) && false))
 
 #ifdef __cplusplus
 }
diff --git a/src/include/tmpl.h b/src/include/tmpl.h
index 7a60f81e1ee..ec99870f4e2 100644
--- a/src/include/tmpl.h
+++ b/src/include/tmpl.h
@@ -250,7 +250,7 @@ typedef struct vp_tmpl_t {
 #ifndef WITH_VERIFY_PTR
 #  define VERIFY_TMPL(_x)
 #else
-#  define VERIFY_TMPL(_x) tmpl_verify(__FILE__,  __LINE__, _x)
+#  define VERIFY_TMPL(_x) tmpl_verify(__FILE__, __LINE__, _x)
 void tmpl_verify(char const *file, int line, vp_tmpl_t const *vpt);
 #endif
 
diff --git a/src/lib/util/inet.c b/src/lib/util/inet.c
index 4651451da08..b3e524f5e60 100644
--- a/src/lib/util/inet.c
+++ b/src/lib/util/inet.c
@@ -797,7 +797,7 @@ char *fr_inet_ntop(char out[FR_IPADDR_STRLEN], size_t outlen, fr_ipaddr_t const
 	}
 #endif
 
-	len = snprintf(p, outlen - (p - out), "%%%u",  addr->scope_id);
+	len = snprintf(p, outlen - (p - out), "%%%u", addr->scope_id);
 	if (is_truncated(len + (p - out), outlen)) {
 		fr_strerror_printf("Address buffer too small, needed %zu bytes, have %zu bytes",
 				   (p - out) + len, outlen);
diff --git a/src/lib/util/token.c b/src/lib/util/token.c
index 9fb80180af2..f6542c54034 100644
--- a/src/lib/util/token.c
+++ b/src/lib/util/token.c
@@ -39,7 +39,7 @@ const FR_NAME_NUMBER fr_tokens_table[] = {
 	{ "+=",	T_OP_ADD,	},
 	{ "-=",	T_OP_SUB,	},
 	{ ":=",	T_OP_SET,	},
-	{ "=*", T_OP_CMP_TRUE,  },
+	{ "=*", T_OP_CMP_TRUE, },
 	{ "!*", T_OP_CMP_FALSE, },
 	{ "==",	T_OP_CMP_EQ,	},
 	{ "=",	T_OP_EQ,	},
diff --git a/src/lib/util/udpfromto.c b/src/lib/util/udpfromto.c
index c5e0036207c..aac990e8029 100644
--- a/src/lib/util/udpfromto.c
+++ b/src/lib/util/udpfromto.c
@@ -551,7 +551,7 @@ int main(int argc, char **argv)
 	in.sin_port = htons(port);
 	fl = tl = sizeof(struct sockaddr_in);
 	memset(&from, 0, sizeof(from));
-	memset(&to,   0, sizeof(to));
+	memset(&to,  0, sizeof(to));
 
 	switch (pid = fork()) {
 		case -1:
diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index a2208bcd77c..c547659b870 100644
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -3700,7 +3700,7 @@ size_t fr_value_box_snprint(char *out, size_t outlen, fr_value_box_t const *data
 		return snprintf(out, outlen, "%zu", data->datum.size);
 
 	case FR_TYPE_TIMEVAL:
-		len = snprintf(buf, sizeof(buf),  "%" PRIu64 ".%06" PRIu64,
+		len = snprintf(buf, sizeof(buf), "%" PRIu64 ".%06" PRIu64,
 			       (uint64_t)data->datum.timeval.tv_sec, (uint64_t)data->datum.timeval.tv_usec);
 		a = buf;
 		break;
diff --git a/src/main/collectd.c b/src/main/collectd.c
index 5c2391422d6..f0bb8e3961b 100644
--- a/src/main/collectd.c
+++ b/src/main/collectd.c
@@ -249,10 +249,10 @@ rs_stats_tmpl_t *rs_stats_collectd_init_latency(TALLOC_CTX *ctx, rs_stats_tmpl_t
 
 	/* not static so were thread safe */
 	rs_stats_value_tmpl_t const _packet_count[] = {
-		{ &stats->interval.received, LCC_TYPE_GAUGE,  _copy_double_to_double, NULL },
-		{ &stats->interval.linked, LCC_TYPE_GAUGE,  _copy_double_to_double, NULL },
-		{ &stats->interval.unlinked, LCC_TYPE_GAUGE,  _copy_double_to_double, NULL },
-		{ &stats->interval.reused, LCC_TYPE_GAUGE,  _copy_double_to_double, NULL },
+		{ &stats->interval.received, LCC_TYPE_GAUGE, _copy_double_to_double, NULL },
+		{ &stats->interval.linked, LCC_TYPE_GAUGE, _copy_double_to_double, NULL },
+		{ &stats->interval.unlinked, LCC_TYPE_GAUGE, _copy_double_to_double, NULL },
+		{ &stats->interval.reused, LCC_TYPE_GAUGE, _copy_double_to_double, NULL },
 		{ NULL, 0, NULL, NULL }
 	};
 
diff --git a/src/main/command.c b/src/main/command.c
index 7ac16fec2f5..e96c3772396 100644
--- a/src/main/command.c
+++ b/src/main/command.c
@@ -100,7 +100,7 @@ static const CONF_PARSER command_config[] = {
 	{ FR_CONF_OFFSET("gid", FR_TYPE_STRING, fr_command_socket_t, gid_name) },
 	{ FR_CONF_OFFSET("mode", FR_TYPE_STRING, fr_command_socket_t, mode_name) },
 	{ FR_CONF_OFFSET("peercred", FR_TYPE_BOOL, fr_command_socket_t, peercred), .dflt = "yes" },
-	{ FR_CONF_OFFSET("blocking", FR_TYPE_BOOL, fr_command_socket_t, blocking),  },
+	{ FR_CONF_OFFSET("blocking", FR_TYPE_BOOL, fr_command_socket_t, blocking), },
 	CONF_PARSER_TERMINATOR
 };
 
@@ -3139,9 +3139,9 @@ static fr_command_table_t command_table[] = {
 	  "terminate - terminates the server, and cause it to exit",
 	  command_terminate, NULL },
 	{ "set", FR_WRITE, NULL, NULL, command_table_set },
-	{ "show",  FR_READ, NULL, NULL, command_table_show },
+	{ "show", FR_READ, NULL, NULL, command_table_show },
 #ifdef WITH_STATS
-	{ "stats",  FR_READ, NULL, NULL, command_table_stats },
+	{ "stats", FR_READ, NULL, NULL, command_table_stats },
 #endif
 
 	{ NULL, 0, NULL, NULL, NULL }
diff --git a/src/main/cond_tokenize.c b/src/main/cond_tokenize.c
index ae28f8e0ee0..51298bd602d 100644
--- a/src/main/cond_tokenize.c
+++ b/src/main/cond_tokenize.c
@@ -141,7 +141,7 @@ next:
 }
 
 
-static ssize_t cond_tokenize_string(TALLOC_CTX *ctx, char **out,  char const **error, char const *start, FR_TOKEN *op)
+static ssize_t cond_tokenize_string(TALLOC_CTX *ctx, char **out, char const **error, char const *start, FR_TOKEN *op)
 {
 	char const *p = start;
 	char *q;
diff --git a/src/main/pair.c b/src/main/pair.c
index 26eb91984a5..6f0d224b538 100644
--- a/src/main/pair.c
+++ b/src/main/pair.c
@@ -746,7 +746,7 @@ void rdebug_pair(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char cons
 
 
 	value = fr_pair_asprint(request, vp, '"');
-	RDEBUGX(level, "%s%s", prefix ? prefix : "&",  value);
+	RDEBUGX(level, "%s%s", prefix ? prefix : "&", value);
 	talloc_free(value);
 }
 
@@ -773,7 +773,7 @@ void rdebug_pair_list(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp, char
 		VERIFY_VP(vp);
 
 		value = fr_pair_asprint(request, vp, '"');
-		RDEBUGX(level, "%s%s", prefix ? prefix : "&",  value);
+		RDEBUGX(level, "%s%s", prefix ? prefix : "&", value);
 		talloc_free(value);
 	}
 	REXDENT();
@@ -803,7 +803,7 @@ void rdebug_proto_pair_list(fr_log_lvl_t level, REQUEST *request, VALUE_PAIR *vp
 		if (vp->da->flags.internal) continue;
 
 		value = fr_pair_asprint(request, vp, '"');
-		RDEBUGX(level, "%s%s", prefix ? prefix : "",  value);
+		RDEBUGX(level, "%s%s", prefix ? prefix : "", value);
 		talloc_free(value);
 	}
 	REXDENT();
diff --git a/src/main/process.c b/src/main/process.c
index 87b2dac1c58..dad8c721e9c 100644
--- a/src/main/process.c
+++ b/src/main/process.c
@@ -5540,7 +5540,7 @@ void radius_event_free(void)
 	}
 #endif
 
-	rbtree_walk(packet_list, RBTREE_DELETE_ORDER,  request_delete_cb, NULL);
+	rbtree_walk(packet_list, RBTREE_DELETE_ORDER, request_delete_cb, NULL);
 
 	if (spawn_workers) {
 		/*
diff --git a/src/main/radsniff.c b/src/main/radsniff.c
index cfb26828941..a9215c9370c 100644
--- a/src/main/radsniff.c
+++ b/src/main/radsniff.c
@@ -604,7 +604,7 @@ static void rs_stats_print_code_fancy(rs_latency_t *stats, FR_CODE code)
 	}
 
 	if (have_rt || stats->interval.lost || stats->interval.reused) {
-		INFO("%s retransmits & loss:",  fr_packet_codes[code]);
+		INFO("%s retransmits & loss:", fr_packet_codes[code]);
 
 		if (stats->interval.lost)	INFO("\tLost      : %.3lf/s", stats->interval.lost);
 		if (stats->interval.reused)	INFO("\tID Reused : %.3lf/s", stats->interval.reused);
diff --git a/src/main/realms.c b/src/main/realms.c
index 8f7f4e5fe80..ce360c62755 100644
--- a/src/main/realms.c
+++ b/src/main/realms.c
@@ -1684,7 +1684,7 @@ static int old_realm_config(realm_config_t *rc, CONF_SECTION *cs, REALM *r)
 			}
 		}
 
-		cf_log_info(cs, "\tauthhost = %s",  host);
+		cf_log_info(cs, "\tauthhost = %s", host);
 
 		if (!old_server_add(rc, cs, r->name, host, secret, ldflag,
 				    &r->auth_pool, HOME_TYPE_AUTH, NULL)) {
diff --git a/src/main/request.c b/src/main/request.c
index 9f666b5b471..b6c581f8cd1 100644
--- a/src/main/request.c
+++ b/src/main/request.c
@@ -71,7 +71,7 @@ static int _request_free(REQUEST *request)
 	 *	This is parented separately.
 	 *
 	 *	The reason why it's OK to do this, is if the state attributes
-	 *	need to persist across requests,  they will already have been
+	 *	need to persist across requests, they will already have been
 	 *	moved to a fr_state_entry_t, with the state pointers in the
 	 *	request being set to NULL, before the request is freed.
 	 */
diff --git a/src/main/tls/session.c b/src/main/tls/session.c
index b7e7348e0ea..81d54f4a1bd 100644
--- a/src/main/tls/session.c
+++ b/src/main/tls/session.c
@@ -355,7 +355,7 @@ void tls_session_info_cb(SSL const *ssl, int where, int ret)
 				break;
 			}
 		} else {
-			REDEBUG("Sending client %s TLS alert: %s %i",  SSL_alert_type_string_long(ret),
+			REDEBUG("Sending client %s TLS alert: %s %i", SSL_alert_type_string_long(ret),
 			       SSL_alert_desc_string_long(ret), ret & 0xff);
 		}
 		return;
diff --git a/src/main/version.c b/src/main/version.c
index cb3b5c09ccc..c42b2686c17 100644
--- a/src/main/version.c
+++ b/src/main/version.c
@@ -562,7 +562,7 @@ void version_print(void)
 			attr = cf_pair_attr(cp);
 
 			DEBUG2("  %s%.*s : %s", attr,
-			       (int)(max - talloc_array_length(attr)), spaces,  cf_pair_value(cp));
+			       (int)(max - talloc_array_length(attr)), spaces, cf_pair_value(cp));
 		}
 
 		talloc_free(features);
@@ -578,7 +578,7 @@ void version_print(void)
 			attr = cf_pair_attr(cp);
 
 			DEBUG2("  %s%.*s : %s", attr,
-			       (int)(max - talloc_array_length(attr)), spaces,  cf_pair_value(cp));
+			       (int)(max - talloc_array_length(attr)), spaces, cf_pair_value(cp));
 		}
 
 #ifdef WITH_TLS
diff --git a/src/main/xlat_eval.c b/src/main/xlat_eval.c
index 045ed641fa5..164337ae2f1 100644
--- a/src/main/xlat_eval.c
+++ b/src/main/xlat_eval.c
@@ -429,7 +429,7 @@ static char *xlat_aprint(TALLOC_CTX *ctx, REQUEST *request, xlat_exp_t const * c
 			if (!localtime_r(&when, &ts)) goto error;
 			nl = str + strftime(str, freespace, "%Y-%m-%d-%H.%M.%S", &ts);
 			rad_assert(((str + freespace) - nl) >= 8);
-			snprintf(nl, (str + freespace) - nl, ".%06d",  (int) microseconds);
+			snprintf(nl, (str + freespace) - nl, ".%06d", (int) microseconds);
 			break;
 
 		case 'Y': /* request year */
diff --git a/src/main/xlat_tokenize.c b/src/main/xlat_tokenize.c
index e331247d5aa..f27b6281f11 100644
--- a/src/main/xlat_tokenize.c
+++ b/src/main/xlat_tokenize.c
@@ -147,7 +147,7 @@ static ssize_t xlat_tokenize_alternation(TALLOC_CTX *ctx, char *fmt, xlat_exp_t
 		*(p++) = '\0';
 
 	} else {
-		slen = xlat_tokenize_literal(node, p,  &node->alternate, true, error);
+		slen = xlat_tokenize_literal(node, p, &node->alternate, true, error);
 		if (slen <= 0) {
 			talloc_free(node);
 			return slen - (p - fmt);
diff --git a/src/modules/proto_dhcp/proto_dhcp.c b/src/modules/proto_dhcp/proto_dhcp.c
index f027831e2d7..a7c5d8a5b1d 100644
--- a/src/modules/proto_dhcp/proto_dhcp.c
+++ b/src/modules/proto_dhcp/proto_dhcp.c
@@ -686,7 +686,7 @@ static const char *dhcp_pcap_filter_build(rad_listen_t *this)
 	 */
 	filter = talloc_strdup(this, "(udp and dst port ");
 	if (sock->lsock.my_port) {
-		filter = talloc_asprintf_append_buffer(filter, "%u)",  sock->lsock.my_port);
+		filter = talloc_asprintf_append_buffer(filter, "%u)", sock->lsock.my_port);
 	} else {
 		filter = talloc_strdup_append_buffer(filter, "bootps)");
 	}
diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index aa3ae24f703..3684ff29a3f 100644
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -673,7 +673,7 @@ static int _proto_ldap_cookie_store(UNUSED fr_ldap_conn_t *conn, sync_config_t c
  *	- 0 on success.
  *	- -1 on failure.
  */
-static int _proto_ldap_entry(fr_ldap_conn_t *conn,  sync_config_t const *config,
+static int _proto_ldap_entry(fr_ldap_conn_t *conn, sync_config_t const *config,
 			     int sync_id, UNUSED sync_phases_t phase,
 			     uint8_t const uuid[SYNC_UUID_LENGTH], LDAPMessage *msg,
 			     sync_states_t state, void *user_ctx)
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
index 18c5fa575df..23dffa265a7 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
@@ -176,7 +176,7 @@ static cache_status_t cache_entry_find(rlm_cache_entry_t **out,
 	RDEBUG2("Retrieved %zu bytes from memcached", len);
 	RDEBUG2("%s", from_store);
 
-	c = talloc_zero(NULL,  rlm_cache_entry_t);
+	c = talloc_zero(NULL, rlm_cache_entry_t);
 	ret = cache_deserialize(c, from_store, len);
 	free(from_store);
 	if (ret < 0) {
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
index 4a7bbe678e1..228ef89ffc8 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
@@ -184,7 +184,7 @@ static cache_status_t cache_entry_find(rlm_cache_entry_t **out,
 	 *	are three chunks per map
 	 */
 
-	c = talloc_pooled_object(NULL,  rlm_cache_entry_t, reply->elements, pool_size);
+	c = talloc_pooled_object(NULL, rlm_cache_entry_t, reply->elements, pool_size);
 	memset(&pool, 0, sizeof(rlm_cache_entry_t));
 #else
 	c = talloc_zero(NULL, rlm_cache_entry_t);
@@ -422,7 +422,7 @@ static cache_status_t cache_entry_insert(UNUSED rlm_cache_config_t const *config
  * @copydetails cache_entry_expire_t
  */
 static cache_status_t cache_entry_expire(UNUSED rlm_cache_config_t const *config, void *instance,
-					 REQUEST *request, UNUSED void *handle,  uint8_t const *key, size_t key_len)
+					 REQUEST *request, UNUSED void *handle, uint8_t const *key, size_t key_len)
 {
 	rlm_cache_redis_t		*driver = instance;
 	fr_redis_cluster_state_t	state;
diff --git a/src/modules/rlm_client/rlm_client.c b/src/modules/rlm_client/rlm_client.c
index e55a026a449..9100688e8f8 100644
--- a/src/modules/rlm_client/rlm_client.c
+++ b/src/modules/rlm_client/rlm_client.c
@@ -170,7 +170,7 @@ static rlm_rcode_t map_proc_client(UNUSED void *mod_inst, UNUSED void *proc_inst
 		 *	Pass the raw data to the callback, which will
 		 *	create the VP and add it to the map.
 		 */
-		if (map_to_request(request, map,  _map_proc_client_get_vp, &uctx) < 0) {
+		if (map_to_request(request, map, _map_proc_client_get_vp, &uctx) < 0) {
 			rcode = RLM_MODULE_FAIL;
 			talloc_free(field);
 			break;
diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index e433d4b155f..de4f1eb16e5 100644
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -65,7 +65,7 @@ static const CONF_PARSER module_config[] = {
 #ifdef WITH_SESSION_MGMT
 	{ FR_CONF_OFFSET("check_simul", FR_TYPE_BOOL, rlm_couchbase_t, check_simul) }, /* NULL defaults to "no" */
 	{ FR_CONF_OFFSET("simul_view", FR_TYPE_STRING, rlm_couchbase_t, simul_view), .dflt = "_design/acct/_view/by_user" },
-	{ FR_CONF_OFFSET("simul_vkey", FR_TYPE_TMPL, rlm_couchbase_t, simul_vkey), .dflt = "%{tolower:%{%{Stripped-User-Name}:-%{User-Name}}}",  .quote = T_DOUBLE_QUOTED_STRING },
+	{ FR_CONF_OFFSET("simul_vkey", FR_TYPE_TMPL, rlm_couchbase_t, simul_vkey), .dflt = "%{tolower:%{%{Stripped-User-Name}:-%{User-Name}}}", .quote = T_DOUBLE_QUOTED_STRING },
 	{ FR_CONF_OFFSET("verify_simul", FR_TYPE_BOOL, rlm_couchbase_t, verify_simul) }, /* NULL defaults to "no" */
 #endif
 	CONF_PARSER_TERMINATOR
diff --git a/src/modules/rlm_eap/lib/base/eap_tls.h b/src/modules/rlm_eap/lib/base/eap_tls.h
index 6b2b21c76b6..a68ec448cf7 100644
--- a/src/modules/rlm_eap/lib/base/eap_tls.h
+++ b/src/modules/rlm_eap/lib/base/eap_tls.h
@@ -172,7 +172,7 @@ size_t SSL_get_client_random(const SSL *ssl, unsigned char *out, size_t outlen);
 size_t SSL_get_server_random(const SSL *ssl, unsigned char *out, size_t outlen);
 #endif
 
-void			T_PRF(unsigned char const *secret, unsigned int secret_len, char const *prf_label, unsigned char const *seed,  unsigned int seed_len, unsigned char *out, unsigned int out_len) CC_HINT(nonnull(1,3,6));
+void			T_PRF(unsigned char const *secret, unsigned int secret_len, char const *prf_label, unsigned char const *seed, unsigned int seed_len, unsigned char *out, unsigned int out_len) CC_HINT(nonnull(1,3,6));
 
 void			eap_tls_gen_mppe_keys(REQUEST *request, SSL *s, char const *prf_label) CC_HINT(nonnull);
 
diff --git a/src/modules/rlm_eap/lib/base/mppe_keys.c b/src/modules/rlm_eap/lib/base/mppe_keys.c
index b4ade0685ad..6af7feb51f7 100644
--- a/src/modules/rlm_eap/lib/base/mppe_keys.c
+++ b/src/modules/rlm_eap/lib/base/mppe_keys.c
@@ -73,7 +73,7 @@ static size_t SSL_SESSION_get_master_key(const SSL_SESSION *s, unsigned char *ou
  */
 static void P_hash(EVP_MD const *evp_md,
 		   unsigned char const *secret, unsigned int secret_len,
-		   unsigned char const *seed,   unsigned int seed_len,
+		   unsigned char const *seed,  unsigned int seed_len,
 		   unsigned char *out, unsigned int out_len)
 {
 	HMAC_CTX *ctx_a, *ctx_out;
@@ -131,7 +131,7 @@ static void P_hash(EVP_MD const *evp_md,
 /*  EAP-FAST Pseudo-Random Function (T-PRF): RFC 4851, Section 5.5 */
 void T_PRF(unsigned char const *secret, unsigned int secret_len,
 	   char const *prf_label,
-	   unsigned char const *seed,  unsigned int seed_len,
+	   unsigned char const *seed, unsigned int seed_len,
 	   unsigned char *out, unsigned int out_len)
 {
 	size_t prf_size = strlen(prf_label);
@@ -172,7 +172,7 @@ void T_PRF(unsigned char const *secret, unsigned int secret_len,
 }
 
 static void PRF(unsigned char const *secret, unsigned int secret_len,
-		unsigned char const *seed,   unsigned int seed_len,
+		unsigned char const *seed,  unsigned int seed_len,
 		unsigned char *out, unsigned char *buf, unsigned int out_len)
 {
 	unsigned int i;
@@ -180,7 +180,7 @@ static void PRF(unsigned char const *secret, unsigned int secret_len,
 	uint8_t const *s1 = secret;
 	uint8_t const *s2 = secret + (secret_len - len);
 
-	P_hash(EVP_md5(),  s1, len, seed, seed_len, out, out_len);
+	P_hash(EVP_md5(), s1, len, seed, seed_len, out, out_len);
 	P_hash(EVP_sha1(), s2, len, seed, seed_len, buf, out_len);
 
 	for (i=0; i < out_len; i++) {
diff --git a/src/modules/rlm_eap/lib/sim/fips186prf.c b/src/modules/rlm_eap/lib/sim/fips186prf.c
index 3c6a9b9f4bc..d5da89be11d 100644
--- a/src/modules/rlm_eap/lib/sim/fips186prf.c
+++ b/src/modules/rlm_eap/lib/sim/fips186prf.c
@@ -112,7 +112,7 @@ void fr_sim_fips186_2prf(uint8_t out[160], uint8_t mk[20])
 	memcpy(&xkey, mk, sizeof(xkey));
 
 	/* make the value 1 */
-	memset(&one,  0, sizeof(one));
+	memset(&one, 0, sizeof(one));
 	one.p[19]=1;
 
 	f = out;
@@ -134,8 +134,8 @@ void fr_sim_fips186_2prf(uint8_t out[160], uint8_t mk[20])
 		fr_sha1_final_no_len(w_0.p, &context);
 
 		/*   c. XKEY = (1 + XKEY + w_0) mod 2^160 */
-		onesixty_add_mod(&sum,  &xkey, &w_0);
-		onesixty_add_mod(&xkey, &sum,  &one);
+		onesixty_add_mod(&sum, &xkey, &w_0);
+		onesixty_add_mod(&xkey, &sum, &one);
 
 		/*   d. XVAL = XKEY  */
 		xval = xkey;
@@ -153,8 +153,8 @@ void fr_sim_fips186_2prf(uint8_t out[160], uint8_t mk[20])
 		fr_sha1_final_no_len(w_1.p, &context);
 
 		/*   f. XKEY = (1 + XKEY + w_1) mod 2^160 */
-		onesixty_add_mod(&sum,  &xkey, &w_1);
-		onesixty_add_mod(&xkey, &sum,  &one);
+		onesixty_add_mod(&sum, &xkey, &w_1);
+		onesixty_add_mod(&xkey, &sum, &one);
 
 		/* now store it away */
 		memcpy(f, &w_0, 20);
diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
index d4c4a763000..24e7ac81201 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.h
@@ -42,7 +42,7 @@ typedef struct rlm_eap_tls {
 
 	bool			req_client_cert;	//!< Whether we require the client to provide
 							//!< a certificate or not.  RFC 5216 says it's
-							//!< not mandatory,  and there are some situations
+							//!< not mandatory, and there are some situations
 							//!< where it's useful to allow client access without
 							//!< a certificate.
 
diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index ddd4a93fe62..2880f749ae5 100644
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -173,7 +173,7 @@ static ssize_t exec_xlat(UNUSED TALLOC_CTX *ctx, char **out, size_t outlen,
 	 *	This function does it's own xlat of the input program
 	 *	to execute.
 	 */
-	result = radius_exec_program(request, *out, outlen, NULL, request, fmt,  input_pairs ? *input_pairs : NULL,
+	result = radius_exec_program(request, *out, outlen, NULL, request, fmt, input_pairs ? *input_pairs : NULL,
 				     inst->wait, inst->shell_escape, inst->timeout);
 	if (result != 0) return -1;
 
diff --git a/src/modules/rlm_redis/cluster.c b/src/modules/rlm_redis/cluster.c
index b92737bb304..57e7c84d0ec 100644
--- a/src/modules/rlm_redis/cluster.c
+++ b/src/modules/rlm_redis/cluster.c
@@ -1460,7 +1460,7 @@ void *fr_redis_cluster_conn_create(TALLOC_CTX *ctx, void *instance, struct timev
 	redisReply		*reply = NULL;
 	char const		*log_prefix = node->cluster->log_prefix;
 
-	DEBUG2("%s [%i]: Connecting node to %s:%i",  log_prefix, node->id, node->name, node->addr.port);
+	DEBUG2("%s [%i]: Connecting node to %s:%i", log_prefix, node->id, node->name, node->addr.port);
 
 	handle = redisConnectWithTimeout(node->name, node->addr.port, *timeout);
 	if ((handle != NULL) && handle->err) {
diff --git a/src/modules/rlm_redis/cluster.h b/src/modules/rlm_redis/cluster.h
index 33b2c799c26..c671ab04eb8 100644
--- a/src/modules/rlm_redis/cluster.h
+++ b/src/modules/rlm_redis/cluster.h
@@ -68,7 +68,7 @@ void *fr_redis_cluster_conn_create(TALLOC_CTX *ctx, void *instance, struct timev
  *	connections implement retry delays.
  */
 fr_redis_rcode_t fr_redis_cluster_state_init(fr_redis_cluster_state_t *state, fr_redis_conn_t **conn,
-					     fr_redis_cluster_t *cluster,  REQUEST *request,
+					     fr_redis_cluster_t *cluster, REQUEST *request,
 					     uint8_t const *key, size_t key_len, bool read_only);
 
 fr_redis_rcode_t fr_redis_cluster_state_next(fr_redis_cluster_state_t *state, fr_redis_conn_t **conn,
diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index e2770b8eb0a..5e02e278db3 100644
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -102,7 +102,7 @@ static const CONF_PARSER module_config[] = {
  *	- 0 if status was updated successfully.
  *	- -1 if status was not updated successfully.
  */
-static int rlm_rest_status_update(REQUEST *request,  void *handle)
+static int rlm_rest_status_update(REQUEST *request, void *handle)
 {
 	TALLOC_CTX	*ctx;
 	VALUE_PAIR	**list;
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
index 0766949d30c..fcf6014d694 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
@@ -100,7 +100,7 @@ static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c
 		 */
 		row = SQLConnect(conn->dbc_handle,
 				    server, SQL_NTS,
-				    login,  SQL_NTS,
+				    login, SQL_NTS,
 				    password, SQL_NTS);
 	}
 
diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index f901515a94b..9b7ccac84a3 100644
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -425,7 +425,7 @@ sql_rcode_t rlm_sql_query(rlm_sql_t const *inst, REQUEST *request, rlm_sql_handl
  *	- #RLM_SQL_RECONNECT if a new handle is required (also sets *handle = NULL).
  *	- #RLM_SQL_QUERY_INVALID, #RLM_SQL_ERROR on invalid query or connection error.
  */
-sql_rcode_t rlm_sql_select_query(rlm_sql_t const *inst, REQUEST *request, rlm_sql_handle_t **handle,  char const *query)
+sql_rcode_t rlm_sql_select_query(rlm_sql_t const *inst, REQUEST *request, rlm_sql_handle_t **handle, char const *query)
 {
 	int ret = RLM_SQL_ERROR;
 	int i, count;
diff --git a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
index 1e7f050e209..36d7f81a7d3 100644
--- a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
+++ b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
@@ -298,7 +298,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(void *instance, UNUSED void *t
 	struct in_addr ip = {0};    /* reserved IP for client (net. byte order) */
 	rlm_sql_handle_t *sqlsock;
 	unsigned long s_gid,	/* _s_elected in sql result set */
-		      s_prio,       /* as above */
+		      s_prio,      /* as above */
 		      s_pid,	/* as above */
 		      gid,	  /* real integer value */
 		      pid,	  /* as above */
diff --git a/src/modules/rlm_yubikey/validate.c b/src/modules/rlm_yubikey/validate.c
index 7553bde54c0..9b6ca315d6a 100644
--- a/src/modules/rlm_yubikey/validate.c
+++ b/src/modules/rlm_yubikey/validate.c
@@ -147,7 +147,7 @@ int rlm_yubikey_ykclient_detach(rlm_yubikey_t *inst)
 	return 0;
 }
 
-rlm_rcode_t rlm_yubikey_validate(rlm_yubikey_t const *inst, REQUEST *request,  char const *passcode)
+rlm_rcode_t rlm_yubikey_validate(rlm_yubikey_t const *inst, REQUEST *request, char const *passcode)
 {
 	rlm_rcode_t rcode = RLM_MODULE_OK;
 	ykclient_rc status;
diff --git a/src/protocols/radius/radius.h b/src/protocols/radius/radius.h
index 523409b6377..f87309115bc 100644
--- a/src/protocols/radius/radius.h
+++ b/src/protocols/radius/radius.h
@@ -151,7 +151,7 @@ ssize_t		fr_radius_decode_tlv(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_dict_attr
 				     uint8_t const *data, size_t data_len,
 				     void *decoder_ctx);
 
-ssize_t		fr_radius_decode_pair(TALLOC_CTX *ctx,  vp_cursor_t *cursor, fr_dict_attr_t const *parent,
+ssize_t		fr_radius_decode_pair(TALLOC_CTX *ctx, vp_cursor_t *cursor, fr_dict_attr_t const *parent,
 				      uint8_t const *data, size_t data_len,
 				      void *decoder_ctx);