From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 17 Oct 2019 12:50:26 +0000 (-0400)
Subject: Minor formatting fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa8bf3b2ee48801251c3ded65ec734e9fb998943;p=thirdparty%2Ffreeradius-server.git

Minor formatting fixes

mostly to kick jenkins
---

diff --git a/src/lib/io/master.h b/src/lib/io/master.h
index 0a239f14b51..6622ccc5aa0 100644
--- a/src/lib/io/master.h
+++ b/src/lib/io/master.h
@@ -72,7 +72,7 @@ typedef struct {
  *  creates the listener, and adds it to the scheduler.
  */
 typedef struct {
-	dl_module_inst_t const   		*dl_inst;			//!< our parent dl_inst
+	dl_module_inst_t const   	*dl_inst;			//!< our parent dl_inst
 
 	uint32_t			max_connections;		//!< maximum number of connections to allow
 	uint32_t			max_clients;			//!< maximum number of dynamic clients to allow
@@ -87,10 +87,10 @@ typedef struct {
 
 	CONF_SECTION			*server_cs;			//!< server CS for this listener
 
-	dl_module_inst_t			*submodule;			//!< As provided by the transport_parse
+	dl_module_inst_t		*submodule;			//!< As provided by the transport_parse
 									///< callback.  Broken out into the
 									///< app_io_* fields below for convenience.
-	dl_module_inst_t			*dynamic_submodule;		//!< for dynamically defined clients
+	dl_module_inst_t		*dynamic_submodule;		//!< for dynamically defined clients
 
 	fr_app_t			*app;				//!< main protocol handler
 	void				*app_instance;			//!< instance data for main protocol handler
diff --git a/src/lib/server/module.h b/src/lib/server/module.h
index 715cd335dcd..d95668a6741 100644
--- a/src/lib/server/module.h
+++ b/src/lib/server/module.h
@@ -189,7 +189,7 @@ struct rad_module_s {
 struct module_instance_s {
 	char const			*name;		//!< Instance name e.g. user_database.
 
-	dl_module_inst_t			*dl_inst;	//!< Structure containing the module's instance data,
+	dl_module_inst_t		*dl_inst;	//!< Structure containing the module's instance data,
 							//!< configuration, and dl handle.
 
 	module_t const			*module;	//!< Public module structure.  Cached for convenience.
diff --git a/src/lib/unlang/module_priv.h b/src/lib/unlang/module_priv.h
index 47c3c414866..25dfefe7d73 100644
--- a/src/lib/unlang/module_priv.h
+++ b/src/lib/unlang/module_priv.h
@@ -44,7 +44,7 @@ typedef struct {
  */
 typedef struct {
 	rlm_rcode_t			*presult;		//!< Where to store the result.
-	module_thread_instance_t 	*thread;		//!< thread-local data for this module
+	module_thread_instance_t	*thread;		//!< thread-local data for this module
 	void				*rctx;			//!< for resume / signal
 	fr_unlang_module_resume_t	resume;			//!< resumption handler
 	fr_unlang_module_signal_t	signal;			//!< for signal handlers
diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c
index db14841d6e9..83155ef7754 100644
--- a/src/lib/unlang/parallel.c
+++ b/src/lib/unlang/parallel.c
@@ -379,7 +379,6 @@ static void unlang_parallel_signal(REQUEST *request, fr_state_signal_t action)
 	}
 }
 
-
 static unlang_action_t unlang_parallel(REQUEST *request, rlm_rcode_t *presult)
 {
 	unlang_stack_t		*stack = request->stack;
@@ -390,7 +389,6 @@ static unlang_action_t unlang_parallel(REQUEST *request, rlm_rcode_t *presult)
 	int			i;
 
 	g = unlang_generic_to_group(instruction);
-
 	if (!g->num_children) {
 		*presult = RLM_MODULE_NOOP;
 		return UNLANG_ACTION_CALCULATE_RESULT;
@@ -399,7 +397,10 @@ static unlang_action_t unlang_parallel(REQUEST *request, rlm_rcode_t *presult)
 	/*
 	 *	Allocate an array for the children.
 	 */
-	frame->state = state = talloc_zero_size(request, sizeof(unlang_parallel_state_t) + sizeof(state->children[0]) * g->num_children);
+	frame->state = state = talloc_zero_array(request,
+						 sizeof(unlang_parallel_state_t) +
+						 sizeof(state->children[0]) *
+						 g->num_children);
 	if (!state) {
 		*presult = RLM_MODULE_FAIL;
 		return UNLANG_ACTION_CALCULATE_RESULT;