From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 12 Apr 2025 17:18:50 +0000 (+0900)
Subject: network/macsec: replace security_association_init() with structured initializer
X-Git-Tag: v258-rc1~803^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c64c71fbe5f3db3f1325d7998e73023b5c58a381;p=thirdparty%2Fsystemd.git

network/macsec: replace security_association_init() with structured initializer
---

diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
index 6dd434f8037..2b17a763da2 100644
--- a/src/network/netdev/macsec.c
+++ b/src/network/netdev/macsec.c
@@ -20,6 +20,12 @@
 #include "string-util.h"
 #include "unaligned.h"
 
+#define SECURITY_ASSOCIATION_NULL               \
+        (SecurityAssociation) {                 \
+                .activate = -1,                 \
+                .use_for_encoding = -1,         \
+        }
+
 static void security_association_clear(SecurityAssociation *sa) {
         if (!sa)
                 return;
@@ -29,13 +35,6 @@ static void security_association_clear(SecurityAssociation *sa) {
         free(sa->key_file);
 }
 
-static void security_association_init(SecurityAssociation *sa) {
-        assert(sa);
-
-        sa->activate = -1;
-        sa->use_for_encoding = -1;
-}
-
 static ReceiveAssociation* macsec_receive_association_free(ReceiveAssociation *c) {
         if (!c)
                 return NULL;
@@ -78,10 +77,9 @@ static int macsec_receive_association_new_static(MACsec *s, const char *filename
         *c = (ReceiveAssociation) {
                 .macsec = s,
                 .section = TAKE_PTR(n),
+                .sa = SECURITY_ASSOCIATION_NULL,
         };
 
-        security_association_init(&c->sa);
-
         r = ordered_hashmap_ensure_put(&s->receive_associations_by_section, &config_section_hash_ops, c->section, c);
         if (r < 0)
                 return r;
@@ -205,10 +203,9 @@ static int macsec_transmit_association_new_static(MACsec *s, const char *filenam
         *a = (TransmitAssociation) {
                 .macsec = s,
                 .section = TAKE_PTR(n),
+                .sa = SECURITY_ASSOCIATION_NULL,
         };
 
-        security_association_init(&a->sa);
-
         r = ordered_hashmap_ensure_put(&s->transmit_associations_by_section, &config_section_hash_ops, a->section, a);
         if (r < 0)
                 return r;