From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 30 Sep 2023 12:27:11 +0000 (-0400)
Subject: more cast fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eac7d00d26cfdb83f31493a96b6367c6bf906431;p=thirdparty%2Ffreeradius-server.git

more cast fixes
---

diff --git a/src/tests/keywords/expr-acct b/src/tests/keywords/expr-acct
index 1f64df27e96..b010495fc9c 100644
--- a/src/tests/keywords/expr-acct
+++ b/src/tests/keywords/expr-acct
@@ -2,7 +2,7 @@
 #  PRE: if edit
 #
 
-&Tmp-String-0 := "%{expr:(<uint64>&Acct-Input-Gigawords << 32) | <uint64>&Acct-Input-Octets}"
+&Tmp-String-0 := "%{expr:((uint64)&Acct-Input-Gigawords << 32) | (uint64)&Acct-Input-Octets}"
 
 if (!(&Tmp-String-0 == '')) {
 	test_fail
diff --git a/src/tests/modules/cipher/rsa_encrypt_decrypt.unlang b/src/tests/modules/cipher/rsa_encrypt_decrypt.unlang
index e86dfac24a8..8e448b11d21 100644
--- a/src/tests/modules/cipher/rsa_encrypt_decrypt.unlang
+++ b/src/tests/modules/cipher/rsa_encrypt_decrypt.unlang
@@ -1,5 +1,5 @@
 &Tmp-String-0 := "Hello world!"
-&Tmp-Octets-0 := "%{cipher_rsa.encrypt:%{Tmp-String-0}}"
+&Tmp-Octets-0 := "%cipher_rsa.encrypt(%{Tmp-String-0})"
 
 if (!&Tmp-Octets-0) {
 	test_fail
@@ -8,7 +8,7 @@ else {
 	test_pass
 }
 
-if (<octets>&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
+if ((octets)&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
 	test_fail
 }
 else {
@@ -49,7 +49,7 @@ else {
 	test_pass
 }
 
-if (<octets>&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
+if ((octets)&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
 	test_fail
 }
 else {
diff --git a/src/tests/modules/cipher/rsa_sign_verify.unlang b/src/tests/modules/cipher/rsa_sign_verify.unlang
index 5325fc66c03..d89e5269bf7 100644
--- a/src/tests/modules/cipher/rsa_sign_verify.unlang
+++ b/src/tests/modules/cipher/rsa_sign_verify.unlang
@@ -5,7 +5,7 @@ if (!&Tmp-Octets-0) {
 	test_fail
 }
 
-if (<octets>&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
+if ((octets)&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
 	test_fail
 }
 
@@ -38,7 +38,7 @@ if (!&Tmp-Octets-0) {
 	test_fail
 }
 
-if (<octets>&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
+if ((octets)&Tmp-String-0[0] == &Tmp-Octets-0[0]) {
 	test_fail
 }
 
diff --git a/src/tests/modules/cipher/valid.unlang b/src/tests/modules/cipher/valid.unlang
index aed4692c0b5..c9b94520b1d 100644
--- a/src/tests/modules/cipher/valid.unlang
+++ b/src/tests/modules/cipher/valid.unlang
@@ -1,8 +1,8 @@
-&Tmp-Date-0 := "%(cipher_rsa.certificate:notBefore)"
-&Tmp-Date-1 := "%(cipher_rsa.certificate:notAfter)"
+&Tmp-Date-0 := "%cipher_rsa.certificate(notBefore)"
+&Tmp-Date-1 := "%cipher_rsa.certificate(notAfter)"
 
 # Check the cert validity period is 30 days
-if (<uint32>"%{expr:%(integer:%{Tmp-Date-1}) - %(integer:%{Tmp-Date-0})}" != <uint32>"%{expr:86400 * 60}") {
+if !((&Tmp-Date-1 - &Tmp-Date-0) == ((time_delta) (86400 * 60))) {
 	test_fail
 } else {
 	test_pass
diff --git a/src/tests/modules/json/eval.unlang b/src/tests/modules/json/eval.unlang
index 0d92f45dc42..d0c06b8cf34 100644
--- a/src/tests/modules/json/eval.unlang
+++ b/src/tests/modules/json/eval.unlang
@@ -370,7 +370,7 @@ if !(&Tmp-Integer-0 == 2147483647) {
 map json &Tmp-String-0 {
 	&Tmp-int64-0 := '$[0]'
 }
-if !(&Tmp-int64-0 == <int64>9223372036854775807) {
+if !(&Tmp-int64-0 == (int64)9223372036854775807) {
 	test_fail
 }