diff options
| author | Christian Hopps <chopps@labn.net> | 2022-02-24 01:43:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 01:43:48 -0500 |
| commit | 7bf63db79b7848b73e1cef49f3496038644bea16 (patch) | |
| tree | 2c95921d910689673348e60f9614de7d9d00c4e7 /ospf6d/ospf6_lsa.c | |
| parent | ca6c97340b013e140c0cb31737858f7c672b7dfb (diff) | |
| parent | cc9f21da2218d95567eff1501482ce58e6600f54 (diff) | |
Merge pull request #10632 from donaldsharp/thread_return_null
*: Change thread->func to return void instead of int
Diffstat (limited to 'ospf6d/ospf6_lsa.c')
| -rw-r--r-- | ospf6d/ospf6_lsa.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c index 99d0de39cf..740a94ba84 100644 --- a/ospf6d/ospf6_lsa.c +++ b/ospf6d/ospf6_lsa.c @@ -829,7 +829,7 @@ struct ospf6_lsa *ospf6_lsa_unlock(struct ospf6_lsa *lsa) /* ospf6 lsa expiry */ -int ospf6_lsa_expire(struct thread *thread) +void ospf6_lsa_expire(struct thread *thread) { struct ospf6_lsa *lsa; struct ospf6 *ospf6; @@ -848,7 +848,7 @@ int ospf6_lsa_expire(struct thread *thread) } if (CHECK_FLAG(lsa->flag, OSPF6_LSA_HEADERONLY)) - return 0; /* dbexchange will do something ... */ + return; /* dbexchange will do something ... */ ospf6 = ospf6_get_by_lsdb(lsa); assert(ospf6); @@ -860,11 +860,9 @@ int ospf6_lsa_expire(struct thread *thread) /* schedule maxage remover */ ospf6_maxage_remove(ospf6); - - return 0; } -int ospf6_lsa_refresh(struct thread *thread) +void ospf6_lsa_refresh(struct thread *thread) { struct ospf6_lsa *old, *self, *new; struct ospf6_lsdb *lsdb_self; @@ -882,7 +880,7 @@ int ospf6_lsa_refresh(struct thread *thread) zlog_debug("Refresh: could not find self LSA, flush %s", old->name); ospf6_lsa_premature_aging(old); - return 0; + return; } /* Reset age, increment LS sequence number. */ @@ -907,8 +905,6 @@ int ospf6_lsa_refresh(struct thread *thread) ospf6_install_lsa(new); ospf6_flood(NULL, new); - - return 0; } void ospf6_flush_self_originated_lsas_now(struct ospf6 *ospf6) |