The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=913e7dc3e0eb7df78ec0e7ecc7dd160a316a3ac6
commit 913e7dc3e0eb7df78ec0e7ecc7dd160a316a3ac6
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2021-03-10 14:50:42 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2021-03-11 09:39:43 +0000
pf: Remove redundant kif != NULL checks
pf_kkif_free() already checks for NULL, so we don't have to check before
we call it.
Reviewed by: melifaro@
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D29195
---
sys/netpfil/pf/pf_ioctl.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 5f9eb771d0e0..977f0debacaa 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -2001,8 +2001,7 @@ pfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int
flags, struct thread *td
DIOCADDRULE_error:
PF_RULES_WUNLOCK();
pf_krule_free(rule);
- if (kif)
- pf_kkif_free(kif);
+ pf_kkif_free(kif);
break;
}
@@ -2300,8 +2299,7 @@ DIOCADDRULE_error:
DIOCCHANGERULE_error:
PF_RULES_WUNLOCK();
pf_krule_free(newrule);
- if (kif != NULL)
- pf_kkif_free(kif);
+ pf_kkif_free(kif);
break;
}
@@ -3144,8 +3142,7 @@ DIOCCHANGEADDR_error:
free(newpa, M_PFRULE);
}
PF_RULES_WUNLOCK();
- if (kif != NULL)
- pf_kkif_free(kif);
+ pf_kkif_free(kif);
break;
}
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
