P2P: Refactor p2p_process_prov_disc_resp() function
authorMax Stepanov <Max.Stepanov@intel.com>
Thu, 2 Jul 2015 07:45:00 +0000 (10:45 +0300)
committerJouni Malinen <j@w1.fi>
Tue, 7 Jul 2015 17:21:44 +0000 (20:21 +0300)
Add 'else if' to P2PS status verification to prevent a redundant
condition checking. The first 'if' condition is true only if
  status == P2P_SC_SUCCESS || status == P2P_SC_SUCCESS_DEFERRED.
while the second condition checks:
  status != P2P_SC_SUCCESS &&
  status != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE &&
  status != P2P_SC_SUCCESS_DEFERRED
Thus, the two conditions are mutually exclusive and 'else if' can be
used if this case.

Signed-off-by: Max Stepanov <Max.Stepanov@intel.com>
Reviewed-by: Ilan Peer <ilan.peer@intel.com>
src/p2p/p2p_pd.c

index ba01da1..1b27063 100644 (file)
@@ -920,11 +920,9 @@ void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa,
                                msg.persistent_ssid_len, 1, 0, NULL);
                }
                p2ps_prov_free(p2p);
-       }
-
-       if (status != P2P_SC_SUCCESS &&
-           status != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE &&
-           status != P2P_SC_SUCCESS_DEFERRED && p2p->p2ps_prov) {
+       } else if (status != P2P_SC_SUCCESS &&
+                  status != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE &&
+                  status != P2P_SC_SUCCESS_DEFERRED && p2p->p2ps_prov) {
                if (p2p->cfg->p2ps_prov_complete)
                        p2p->cfg->p2ps_prov_complete(
                                p2p->cfg->cb_ctx, status, sa, adv_mac,