forked from Mirror/frr
lib,ripd: resolve clang SA warnings
Looks like there were a couple of SA warnings lurking; fix them. Signed-off-by: Mark Stapp <mjs@cisco.com>
This commit is contained in:
parent
e2515f7a4f
commit
27ba9956a1
|
@ -157,7 +157,8 @@ nb_op_create_yield_state(const char *xpath, struct yang_translator *translator,
|
||||||
/* remove trailing '/'s */
|
/* remove trailing '/'s */
|
||||||
while (darr_len(ys->xpath) > 1 && ys->xpath[darr_len(ys->xpath) - 2] == '/') {
|
while (darr_len(ys->xpath) > 1 && ys->xpath[darr_len(ys->xpath) - 2] == '/') {
|
||||||
darr_setlen(ys->xpath, darr_len(ys->xpath) - 1);
|
darr_setlen(ys->xpath, darr_len(ys->xpath) - 1);
|
||||||
*darr_last(ys->xpath) = 0;
|
if (darr_last(ys->xpath))
|
||||||
|
*darr_last(ys->xpath) = 0;
|
||||||
}
|
}
|
||||||
ys->xpath_orig = darr_strdup(xpath);
|
ys->xpath_orig = darr_strdup(xpath);
|
||||||
ys->translator = translator;
|
ys->translator = translator;
|
||||||
|
|
10
ripd/ripd.c
10
ripd/ripd.c
|
@ -282,8 +282,14 @@ struct rip_info *rip_ecmp_replace(struct rip *rip, struct rip_info *rinfo_new)
|
||||||
*/
|
*/
|
||||||
struct rip_info *rip_ecmp_delete(struct rip *rip, struct rip_info *rinfo)
|
struct rip_info *rip_ecmp_delete(struct rip *rip, struct rip_info *rinfo)
|
||||||
{
|
{
|
||||||
struct route_node *rp = rinfo->rp;
|
struct route_node *rp;
|
||||||
struct list *list = (struct list *)rp->info;
|
struct list *list;
|
||||||
|
|
||||||
|
if (rinfo == NULL)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
rp = rinfo->rp;
|
||||||
|
list = (struct list *)rp->info;
|
||||||
|
|
||||||
EVENT_OFF(rinfo->t_timeout);
|
EVENT_OFF(rinfo->t_timeout);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue