From: W.C.A. Wijngaards Date: Fri, 15 Sep 2023 11:30:30 +0000 (+0200) Subject: - Fix to remove two c99 notations. X-Git-Tag: release-1.19.0rc1~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31218166fcd2a56ccc65d359071d5831c16a18a2;p=thirdparty%2Funbound.git - Fix to remove two c99 notations. --- diff --git a/doc/Changelog b/doc/Changelog index edec31aca..998b0d33c 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,6 @@ 15 September 2023: Wouter - Merge #936: Check for c99 with autoconf versions prior to 2.70. + - Fix to remove two c99 notations. 14 September 2023: Wouter - Fix authority zone answers for obscured DNAMEs and delegations. diff --git a/dynlibmod/dynlibmod.c b/dynlibmod/dynlibmod.c index ffac7ff30..1e040a30e 100644 --- a/dynlibmod/dynlibmod.c +++ b/dynlibmod/dynlibmod.c @@ -75,6 +75,7 @@ int dynlibmod_init(struct module_env* env, int id) { struct config_strlist* cfg_item = env->cfg->dynlib_file; struct dynlibmod_env* de = (struct dynlibmod_env*)calloc(1, sizeof(struct dynlibmod_env)); __DYNMOD dynamic_library; + int i; if (!de) { log_err("dynlibmod[%d]: malloc failure", dynlib_mod_idx); @@ -84,7 +85,7 @@ int dynlibmod_init(struct module_env* env, int id) { env->modinfo[id] = (void*) de; de->fname = NULL; - for(int i = dynlib_mod_idx; + for(i = dynlib_mod_idx; i != 0 && cfg_item != NULL; i--, cfg_item = cfg_item->next) {} diff --git a/util/net_help.c b/util/net_help.c index e559c9b2f..dec46da20 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -809,6 +809,7 @@ addr_to_nat64(const struct sockaddr_storage* addr, struct sockaddr_in *sin = (struct sockaddr_in *)addr; struct sockaddr_in6 *sin6; uint8_t *v4_byte; + int i; /* This needs to be checked by the caller */ log_assert(addr->ss_family == AF_INET); @@ -826,7 +827,7 @@ addr_to_nat64(const struct sockaddr_storage* addr, nat64_prefixnet = nat64_prefixnet / 8; v4_byte = (uint8_t *)&sin->sin_addr.s_addr; - for(int i = 0; i < 4; i++) { + for(i = 0; i < 4; i++) { if(nat64_prefixnet == 8) { /* bits 64...71 are MBZ */ sin6->sin6_addr.s6_addr[nat64_prefixnet++] = 0;