proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 12:41:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9727 from ton31337/feature/catch_struct_thread_xxx_against_NULL_coccinelle

Browse Source 
bgpd: Don't set NULL for struct thread at bgp_dump_interval_func()
This commit is contained in:
Igor Ryzhov 2021-10-08 11:40:07 +03:00 committed by GitHub
commit b1e27fbba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bgpd/bgp_dump.c
View File

@ -165,13 +165,11 @@ static int bgp_dump_interval_add(struct bgp_dump *bgp_dump, int interval)
interval = interval interval = interval
- secs_into_day % interval; /* always > 0 */ - secs_into_day % interval; /* always > 0 */
} }
bgp_dump->t_interval = NULL;
thread_add_timer(bm->master, bgp_dump_interval_func, bgp_dump, thread_add_timer(bm->master, bgp_dump_interval_func, bgp_dump,
interval, &bgp_dump->t_interval); interval, &bgp_dump->t_interval);
} else { } else {
/* One-off dump: execute immediately, don't affect any scheduled /* One-off dump: execute immediately, don't affect any scheduled
* dumps */ * dumps */
bgp_dump->t_interval = NULL;
thread_add_event(bm->master, bgp_dump_interval_func, bgp_dump, thread_add_event(bm->master, bgp_dump_interval_func, bgp_dump,
0, &bgp_dump->t_interval); 0, &bgp_dump->t_interval);
} }
@ -453,7 +451,6 @@ static int bgp_dump_interval_func(struct thread *t)
{ {
struct bgp_dump *bgp_dump; struct bgp_dump *bgp_dump;
bgp_dump = THREAD_ARG(t); bgp_dump = THREAD_ARG(t);
bgp_dump->t_interval = NULL;
/* Reschedule dump even if file couldn't be opened this time... */ /* Reschedule dump even if file couldn't be opened this time... */
if (bgp_dump_open_file(bgp_dump) != NULL) { if (bgp_dump_open_file(bgp_dump) != NULL) {