From ce4224f86c5fb33f8c7d4a8a9cbe88c42c9bdf74 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 12 Nov 2018 16:37:23 +0100 Subject: coverity: gscon_forget_lchan: squelch forward-null conn->fi should actually never be NULL, they are allocated and discarded simultaneously. So check its null from the start and remove some conditions below, to remove the coverity warning. Related: CID 189671 Change-Id: I62354aa998832131c86535f39a29294000114adc --- src/osmo-bsc/bsc_subscr_conn_fsm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 0dd21d9b9..d2ca03e37 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -672,14 +672,12 @@ void gscon_forget_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan /* Log for both lchan FSM and conn FSM to ease reading the log in case of problems */ if (detach_label) { - if (conn->fi) - LOGPFSML(conn->fi, LOGL_DEBUG, "conn detaches lchan %s\n", - lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); + LOGPFSML(conn->fi, LOGL_DEBUG, "conn detaches lchan %s\n", + lchan->fi? osmo_fsm_inst_name(lchan->fi) : gsm_lchan_name(lchan)); if (lchan->fi) LOGPFSML(lchan->fi, LOGL_DEBUG, "conn %s detaches lchan (%s)\n", - conn->fi? osmo_fsm_inst_name(conn->fi) : "(conn without FSM)", - detach_label); + osmo_fsm_inst_name(conn->fi), detach_label); } if (conn->fi->state != ST_CLEARING -- cgit v1.2.3