request_data_by_persistance → request_data_by_persistence_count

Author: DimitriPapadopoulos

src/lib/server/request_data.c

@@ -369,7 +369,7 @@ void *request_data_reference(request_t *request, void const *unique_ptr, int uni
  * @param[in] persist	Whether to pull persistable or non-persistable data.
  * @return number of request_data_t retrieved.
  */
-int request_data_by_persistance(fr_dlist_head_t *out, request_t *request, bool persist)
+int request_data_by_persistence(fr_dlist_head_t *out, request_t *request, bool persist)
 {
 	int		count = 0;
 	request_data_t	*rd = NULL, *prev;
@@ -395,7 +395,7 @@ int request_data_by_persistance(fr_dlist_head_t *out, request_t *request, bool p
  * @param[in] persist	Whether to pull persistable or non-persistable data.
  * @return number of request_data_t retrieved.
  */
-int request_data_by_persistance_reparent(TALLOC_CTX *ctx, fr_dlist_head_t *out, request_t *request, bool persist)
+int request_data_by_persistence_reparent(TALLOC_CTX *ctx, fr_dlist_head_t *out, request_t *request, bool persist)
 {
 	int			count = 0;
 	request_data_t		*rd = NULL, *new, *prev;
@@ -438,7 +438,7 @@ int request_data_by_persistance_reparent(TALLOC_CTX *ctx, fr_dlist_head_t *out,
  * @param[in] persist	Whether to count persistable or non-persistable data.
  * @return number of request_data_t that exist in persistable or non-persistable form
  */
-int request_data_by_persistance_count(request_t *request, bool persist)
+int request_data_by_persistence_count(request_t *request, bool persist)
 {
 	int 		count = 0;
 	request_data_t	*rd = NULL;
@@ -475,7 +475,7 @@ void request_data_persistable_free(request_t *request)
 
 	fr_dlist_talloc_init(&head, request_data_t, list);
 
-	request_data_by_persistance(&head, request, true);
+	request_data_by_persistence(&head, request, true);
 
 	fr_dlist_talloc_free(&head);
 }

src/lib/server/request_data.h

@@ -94,12 +94,12 @@ void		*request_data_get(request_t *request, void const *unique_ptr, int unique_i
 
 void		*request_data_reference(request_t *request, void const *unique_ptr, int unique_int);
 
-int		request_data_by_persistance(fr_dlist_head_t *out, request_t *request, bool persist);
+int		request_data_by_persistence(fr_dlist_head_t *out, request_t *request, bool persist);
 
-int		request_data_by_persistance_reparent(TALLOC_CTX *ctx, fr_dlist_head_t *out,
+int		request_data_by_persistence_reparent(TALLOC_CTX *ctx, fr_dlist_head_t *out,
 						     request_t *request, bool persist);
 
-int		request_data_by_persistance_count(request_t *request, bool persist);
+int		request_data_by_persistence_count(request_t *request, bool persist);
 
 void		request_data_restore(request_t *request, fr_dlist_head_t *in);
 

src/lib/server/state.c

@@ -819,7 +819,7 @@ int fr_state_store(fr_state_tree_t *state, request_t *request)
 
 	old = request_data_get(request, state, 0);
 	request_data_list_init(&data);
-	request_data_by_persistance(&data, request, true);
+	request_data_by_persistence(&data, request, true);
 
 	if (fr_pair_list_empty(&request->session_state_pairs) && fr_dlist_empty(&data)) return 0;
 
@@ -921,7 +921,7 @@ void fr_state_store_in_parent(request_t *child, void const *unique_ptr, int uniq
 
 	RDEBUG3("Storing subrequest state in request %s", child->parent->name);
 
-	if ((request_data_by_persistance_count(request, true) > 0) ||
+	if ((request_data_by_persistence_count(request, true) > 0) ||
 		!fr_pair_list_empty(&request->session_state_pairs)) {
 		MEM(child_entry = talloc_zero(request->parent->session_state_ctx, state_child_entry_t));
 		request_data_list_init(&child_entry->data);
@@ -938,7 +938,7 @@ void fr_state_store_in_parent(request_t *child, void const *unique_ptr, int uniq
 		 *	which is why we don't need to copy or
 		 *	reparent any of this.
 		 */
-		request_data_by_persistance(&child_entry->data, request, true);
+		request_data_by_persistence(&child_entry->data, request, true);
 
 		/*
 		 *	...and add the request_data from