network/macsec: replace security_association_init() with structured initializer

This commit is contained in:
Yu Watanabe
2025-04-16 23:29:45 +09:00
parent 2af1f13c6f
commit c64c71fbe5
+8 -11
View File
@@ -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;