Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lib: fix -Wshadow warnings in the lib modules

Browse source 
Fix various "shadow" warnings in lib.

Signed-off-by: Mark Stapp <mjs@cisco.com>
This commit is contained in:
Mark Stapp 2025-01-30 11:39:00 -05:00
parent d683c4d8de
commit 028872bf40
6 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/darr.h
View file

@ -511,11 +511,11 @@ void *__darr_resize(void *a, uint count, size_t esize, struct memtype *mt);
*/
#define darr_pop(A) \
({ \
uint __len = _darr_len(A); \
assert(__len); \
darr_remove(A, __len - 1); \
uint __poplen = _darr_len(A); \
assert(__poplen); \
darr_remove(A, __poplen - 1); \
/* count on fact that we don't resize */ \
(A)[__len - 1]; \
(A)[__poplen - 1]; \
})
/**

14
lib/elf_py.c
View file

@ -518,12 +518,12 @@ static void elfsect_add_relocations(struct elfsect *w, Elf_Scn *rel,
relw->es = w;
if (relhdr->sh_type == SHT_REL) {
GElf_Rel _rel, *rel;
GElf_Rel _rel, *erel;
rel = gelf_getrel(reldata, i, &_rel);
erel = gelf_getrel(reldata, i, &_rel);
relw->rela = &relw->_rela;
relw->rela->r_offset = rel->r_offset;
relw->rela->r_info = rel->r_info;
relw->rela->r_offset = erel->r_offset;
relw->rela->r_info = erel->r_info;
relw->rela->r_addend = 0;
relw->relative = true;
} else
@ -581,14 +581,14 @@ static PyObject *elfsect_wrap(struct elffile *ef, Elf_Scn *scn, size_t idx,
elfrelocs_init(&w->relocs);
for (i = 0; i < ef->ehdr->e_shnum; i++) {
Elf_Scn *scn = elf_getscn(ef->elf, i);
GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr);
Elf_Scn *escn = elf_getscn(ef->elf, i);
GElf_Shdr _shdr, *shdr = gelf_getshdr(escn, &_shdr);
if (shdr->sh_type != SHT_RELA && shdr->sh_type != SHT_REL)
continue;
if (shdr->sh_info && shdr->sh_info != idx)
continue;
elfsect_add_relocations(w, scn, shdr);
elfsect_add_relocations(w, escn, shdr);
}
return (PyObject *)w;

8
lib/libfrr.c
View file

@ -1192,9 +1192,10 @@ void frr_detach(void)
frr_check_detach();
}
void frr_run(struct event_loop *master)
void frr_run(struct event_loop *loop)
{
char instanceinfo[64] = "";
struct event thread;
if (!(di->flags & FRR_MANUAL_VTY_START))
frr_vty_serv_start(false);
@ -1212,7 +1213,7 @@ void frr_run(struct event_loop *master)
vty_stdio(frr_terminal_close);
if (daemon_ctl_sock != -1) {
set_nonblocking(daemon_ctl_sock);
event_add_read(master, frr_daemon_ctl, NULL,
event_add_read(loop, frr_daemon_ctl, NULL,
daemon_ctl_sock, &daemon_ctl_thread);
}
} else if (di->daemon_mode) {
@ -1242,8 +1243,7 @@ void frr_run(struct event_loop *master)
/* end fixed stderr startup logging */
zlog_startup_end();
struct event thread;
while (event_fetch(master, &thread))
while (event_fetch(loop, &thread))
event_call(&thread);
}

6
lib/link_state.c
View file

@ -2555,9 +2555,9 @@ static void ls_show_edge_json(struct ls_edge *edge, struct json_object *json)
if (CHECK_FLAG(attr->flags, LS_ATTR_UNRSV_BW)) {
jbw = json_object_new_array();
json_object_object_add(jte, "unreserved-bandwidth", jbw);
for (int i = 0; i < MAX_CLASS_TYPE; i++) {
for (i = 0; i < MAX_CLASS_TYPE; i++) {
jobj = json_object_new_object();
snprintfrr(buf, 13, "class-type-%u", i);
snprintfrr(buf, 13, "class-type-%u", (unsigned int)i);
json_object_double_add(jobj, buf,
attr->standard.unrsv_bw[i]);
json_object_array_add(jbw, jobj);
@ -2599,7 +2599,7 @@ static void ls_show_edge_json(struct ls_edge *edge, struct json_object *json)
if (CHECK_FLAG(attr->flags, LS_ATTR_SRLG)) {
jsrlg = json_object_new_array();
json_object_object_add(jte, "srlgs", jsrlg);
for (int i = 1; i < attr->srlg_len; i++) {
for (i = 1; i < attr->srlg_len; i++) {
jobj = json_object_new_object();
json_object_int_add(jobj, "srlg", attr->srlgs[i]);
json_object_array_add(jsrlg, jobj);

16
lib/printf/vfprintf.c
View file

@ -556,23 +556,23 @@ reswitch: switch (ch) {
case 'G':
if (flags & LONGDBL) {
long double arg = GETARG(long double);
char fmt[6] = "%.*L";
fmt[4] = ch;
fmt[5] = '\0';
char lfmt[6] = "%.*L";
lfmt[4] = ch;
lfmt[5] = '\0';
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
snprintf(buf, sizeof(buf), fmt, prec, arg);
snprintf(buf, sizeof(buf), lfmt, prec, arg);
#pragma GCC diagnostic pop
} else {
double arg = GETARG(double);
char fmt[5] = "%.*";
fmt[3] = ch;
fmt[4] = '\0';
char lfmt[5] = "%.*";
lfmt[3] = ch;
lfmt[4] = '\0';
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
snprintf(buf, sizeof(buf), fmt, prec, arg);
snprintf(buf, sizeof(buf), lfmt, prec, arg);
#pragma GCC diagnostic pop
}
cp = buf;

6
lib/zclient.c
View file

@ -3014,7 +3014,7 @@ size_t zebra_interface_link_params_write(struct stream *s,
size_t w, nb_ext_adm_grp;
struct if_link_params *iflp;
int i;
size_t j;
if (s == NULL || ifp == NULL)
return 0;
@ -3045,8 +3045,8 @@ size_t zebra_interface_link_params_write(struct stream *s,
/* Extended Administrative Group */
nb_ext_adm_grp = admin_group_nb_words(&iflp->ext_admin_grp);
w += stream_putc(s, nb_ext_adm_grp);
for (size_t i = 0; i < nb_ext_adm_grp; i++)
stream_putl(s, admin_group_get_offset(&iflp->ext_admin_grp, i));
for (j = 0; j < nb_ext_adm_grp; j++)
stream_putl(s, admin_group_get_offset(&iflp->ext_admin_grp, j));
w += stream_putl(s, iflp->rmt_as);
w += stream_put_in_addr(s, &iflp->rmt_ip);