On Mon, Jun 01, 2015 at 10:22:00AM +0100, Paul Aitken wrote:
> ct and myct have both already been checked for non-NULL,
> so there's no need to check either of them again later.
>
> Signed-off-by: Paul Aitken <paitken@xxxxxxxxxxx>
> ---
> src/cthelper.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/src/cthelper.c b/src/cthelper.c
> index 15d5126..6537515 100644
> --- a/src/cthelper.c
> +++ b/src/cthelper.c
> @@ -325,14 +325,12 @@ static int nfq_queue_cb(const struct nlmsghdr *nlh, void *data)
> if (pkt_verdict_issue(helper, myct, queue_num, id, verdict, pktb) < 0)
> goto err_pktb;
> - if (ct != NULL)
> - nfct_destroy(ct);
> + nfct_destroy(ct);
void nfct_destroy(struct nf_conntrack *ct)
{
assert(ct != NULL);
...
the library doesn't allow NULL pointers.
> if (myct->exp != NULL)
> nfexp_destroy(myct->exp);
> - if (myct && myct->priv_data != NULL)
> + if (myct->priv_data != NULL)
> free(myct->priv_data);
> - if (myct != NULL)
> - free(myct);
> + free(myct);
> return MNL_CB_OK;
> err_pktb:
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
