commit b95bbf1851c1979160f34e54c41a05c9fcca1960
author roman <xjanot04@fit.vutbr.cz> Wed Aug 07 09:22:53 2024 +0200
committer Michal Vasko <mvasko@cesnet.cz> Wed Aug 14 15:36:02 2024 +0200
tree 3ea50de81479cbdd67dfa4f31fb6c9bd6b5c9414
parent b6c64d37d7305eacb1b6048151696476cbb33405

server config REFACTOR assign structs

src/server_config.c

diff --git a/src/server_config.c b/src/server_config.c
index d0a7b65..b74433a 100644
--- a/src/server_config.c
+++ b/src/server_config.c
@@ -3859,27 +3859,25 @@
 nc_server_config_create_interval(const char *anchor, const char *period)
 {
     int ret = 0;
-    struct nc_cert_exp_time cert_exp_time = {0};
+    struct nc_cert_exp_time anchor_time = {0}, period_time = {0};
 
     server_opts.cert_exp_notif.intervals = nc_realloc(server_opts.cert_exp_notif.intervals,
             (server_opts.cert_exp_notif.interval_count + 1) * sizeof *server_opts.cert_exp_notif.intervals);
     NC_CHECK_ERRMEM_RET(!server_opts.cert_exp_notif.intervals, 1);
 
     /* convert and set the anchor */
-    ret = nc_server_config_yang_value2cert_exp_time(anchor, &cert_exp_time);
+    ret = nc_server_config_yang_value2cert_exp_time(anchor, &anchor_time);
     if (ret) {
         goto cleanup;
     }
-    memcpy(&server_opts.cert_exp_notif.intervals[server_opts.cert_exp_notif.interval_count].anchor,
-            &cert_exp_time, sizeof cert_exp_time);
+    server_opts.cert_exp_notif.intervals[server_opts.cert_exp_notif.interval_count].anchor = anchor_time;
 
     /* convert and set the period */
-    ret = nc_server_config_yang_value2cert_exp_time(period, &cert_exp_time);
+    ret = nc_server_config_yang_value2cert_exp_time(period, &period_time);
     if (ret) {
         goto cleanup;
     }
-    memcpy(&server_opts.cert_exp_notif.intervals[server_opts.cert_exp_notif.interval_count].period,
-            &cert_exp_time, sizeof cert_exp_time);
+    server_opts.cert_exp_notif.intervals[server_opts.cert_exp_notif.interval_count].period = period_time;
 
     ++server_opts.cert_exp_notif.interval_count;
 
@@ -3916,9 +3914,8 @@
         free(server_opts.cert_exp_notif.intervals);
         server_opts.cert_exp_notif.intervals = NULL;
     } else if (i != server_opts.cert_exp_notif.interval_count) {
-        memcpy(&server_opts.cert_exp_notif.intervals[i],
-                &server_opts.cert_exp_notif.intervals[server_opts.cert_exp_notif.interval_count],
-                sizeof *server_opts.cert_exp_notif.intervals);
+        server_opts.cert_exp_notif.intervals[i] =
+                server_opts.cert_exp_notif.intervals[server_opts.cert_exp_notif.interval_count];
     }
 }