diff options
| author | Paul Donald | 2025-11-11 18:09:57 +0000 |
|---|---|---|
| committer | Álvaro Fernández Rojas | 2025-11-23 19:09:35 +0000 |
| commit | 25a0c40580f95c83cdacad6d1ca17d4046d14df5 (patch) | |
| tree | 2008c28d0df11fc405fb8af16e3b7038835aee1a | |
| parent | 165bcc68ef2bec44b158ecede415add972f2117d (diff) | |
| download | odhcp6c-25a0c40580f95c83cdacad6d1ca17d4046d14df5.tar.gz | |
dhcpv6: refactor variable names
improve readability
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
Link: https://github.com/openwrt/odhcp6c/pull/123
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
| -rw-r--r-- | src/dhcpv6.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 0bb6ca8..4077e0f 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -1986,26 +1986,26 @@ static void dhcpv6_handle_ia_status_code(const enum dhcpv6_msg orig, static void dhcpv6_add_server_cand(const struct dhcpv6_server_cand *cand) { size_t cand_len, i; - struct dhcpv6_server_cand *c = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len); + struct dhcpv6_server_cand *srv_candidates = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len); // Remove identical DUID server candidate - for (i = 0; i < cand_len / sizeof(*c); ++i) { - if (cand->duid_len == c[i].duid_len && - !memcmp(cand->duid, c[i].duid, cand->duid_len)) { - free(c[i].ia_na); - free(c[i].ia_pd); - odhcp6c_remove_state(STATE_SERVER_CAND, i * sizeof(*c), sizeof(*c)); + for (i = 0; i < cand_len / sizeof(*srv_candidates); ++i) { + if (cand->duid_len == srv_candidates[i].duid_len && + !memcmp(cand->duid, srv_candidates[i].duid, cand->duid_len)) { + free(srv_candidates[i].ia_na); + free(srv_candidates[i].ia_pd); + odhcp6c_remove_state(STATE_SERVER_CAND, i * sizeof(*srv_candidates), sizeof(*srv_candidates)); break; } } - for (i = 0, c = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len); - i < cand_len / sizeof(*c); ++i) { - if (c[i].preference < cand->preference) + for (i = 0, srv_candidates = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len); + i < cand_len / sizeof(*srv_candidates); ++i) { + if (srv_candidates[i].preference < cand->preference) break; } - if (odhcp6c_insert_state(STATE_SERVER_CAND, i * sizeof(*c), cand, sizeof(*cand))) { + if (odhcp6c_insert_state(STATE_SERVER_CAND, i * sizeof(*srv_candidates), cand, sizeof(*cand))) { free(cand->ia_na); free(cand->ia_pd); } @@ -2014,12 +2014,12 @@ static void dhcpv6_add_server_cand(const struct dhcpv6_server_cand *cand) static void dhcpv6_clear_all_server_cand(void) { size_t cand_len, i; - struct dhcpv6_server_cand *c = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len); + struct dhcpv6_server_cand *srv_candidates = odhcp6c_get_state(STATE_SERVER_CAND, &cand_len); // Server candidates need deep delete for IA_NA/IA_PD - for (i = 0; i < cand_len / sizeof(*c); ++i) { - free(c[i].ia_na); - free(c[i].ia_pd); + for (i = 0; i < cand_len / sizeof(*srv_candidates); ++i) { + free(srv_candidates[i].ia_na); + free(srv_candidates[i].ia_pd); } odhcp6c_clear_state(STATE_SERVER_CAND); } |