From: Nick Porter <nick@portercomputing.co.uk>
Date: Tue, 1 Apr 2025 20:28:09 +0000 (+0100)
Subject: Remove type from static definition
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b442956c2bc044ab181a607d023dd1b5ff26b969;p=thirdparty%2Ffreeradius-server.git

Remove type from static definition

Causes "initializer element is not constant" error
---

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index ecdfe7aef53..03da5252b8c 100644
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -229,7 +229,7 @@ static const call_env_method_t authorize_method_env = {
 						{ FR_CALL_ENV_PARSE_ONLY_OFFSET("membership_filter", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, ldap_autz_call_env_t, group_filter),
 						  .pair.func = ldap_group_filter_parse,
 						  .pair.escape = {
-							  .box_escape = (fr_value_box_escape_t) {
+							  .box_escape = {
 								  .func = fr_ldap_box_escape,
 								  .safe_for = (fr_value_box_safe_for_t)fr_ldap_box_escape,
 								  .always_escape = false,
@@ -280,7 +280,7 @@ static const call_env_method_t xlat_memberof_method_env = {
 						{ FR_CALL_ENV_PARSE_ONLY_OFFSET("membership_filter", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, ldap_xlat_memberof_call_env_t, group_filter),
 						  .pair.func = ldap_group_filter_parse,
 						  .pair.escape = {
-							  .box_escape = (fr_value_box_escape_t) {
+							  .box_escape = {
 								  .func = fr_ldap_box_escape,
 								  .safe_for = (fr_value_box_safe_for_t)fr_ldap_box_escape,
 								  .always_escape = false,
diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index 54f66167e5f..3de1f3cfa82 100644
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -209,7 +209,7 @@ typedef struct {
 	fr_value_box_t		*filename;		//!< File name, if output is to a file.
 } linelog_call_env_t;
 
-#define LINELOG_BOX_ESCAPE (fr_value_box_escape_t) { \
+#define LINELOG_BOX_ESCAPE { \
 			  .func = linelog_escape_func, \
 			  .safe_for = (fr_value_box_safe_for_t) linelog_escape_func, \
 			  .always_escape = false, \
diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index b759b2fece8..44e0d889a03 100644
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -206,7 +206,7 @@ static const call_env_method_t _var = { \
 							((call_env_parser_t[]) { \
 								{ FR_CALL_ENV_OFFSET("uri", FR_TYPE_STRING, CALL_ENV_FLAG_REQUIRED | CALL_ENV_FLAG_CONCAT, rlm_rest_call_env_t, request.uri), \
 										     .pair.escape = { \
-											.box_escape = (fr_value_box_escape_t) { \
+											.box_escape = { \
 												.func = fr_uri_escape, \
 												.safe_for = CURL_URI_SAFE_FOR, \
 												.always_escape = true, /* required! */ \
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 5750105c4ee..70e3cfb3259 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -131,7 +131,7 @@ static const call_env_method_t xlat_method_env = {
 	.env = (call_env_parser_t[]) {
 		{ FR_CALL_ENV_OFFSET("logfile", FR_TYPE_STRING, CALL_ENV_FLAG_CONCAT, sql_xlat_call_env_t, filename),
 		  .pair.escape = {
-			  .box_escape = (fr_value_box_escape_t) {
+			  .box_escape = {
 				  .func = rad_filename_box_make_safe,
 				  .safe_for = (fr_value_box_safe_for_t)rad_filename_box_make_safe,
 				  .always_escape = false,
diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 00e0754d183..2333fd9b138 100644
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -690,7 +690,7 @@ static int call_env_parse(TALLOC_CTX *ctx, void *out, tmpl_rules_t const *t_rule
 }
 
 #define QUERY_ESCAPE .pair.escape = { \
-	.box_escape = (fr_value_box_escape_t) { \
+	.box_escape = { \
 		.func = sqlippool_box_escape,	\
 		.safe_for = FR_VALUE_BOX_SAFE_FOR_NONE, \
 		.always_escape = true, \