Replace "sanity" with "validity"

Replaced the word "sanity" with the inclusive word "validity". The
comment in acs_survey_interference_factor() was referring a function
that does not exist, so remove it instead of trying rename the function.

Signed-off-by: Arowa Suliman <arowa@chromium.org>

diff --git a/src/ap/acs.c b/src/ap/acs.c
index 865a415c30a4b1ff9365612cdb61427a13427364..46429f26543333961e6b1acfa9f999750ea56028 100644 (file)
--- a/src/ap/acs.c
+++ b/src/ap/acs.c
@@ -309,8 +309,6 @@ acs_survey_interference_factor(struct freq_survey *survey, s8 min_nf)
        else if (survey->filled & SURVEY_HAS_CHAN_TIME_RX)
                busy = survey->channel_time_rx;
        else {
-               /* This shouldn't really happen as survey data is checked in
-                * acs_sanity_check() */
                wpa_printf(MSG_ERROR, "ACS: Survey data missing");
                return 0;
        }

diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
index e80086b93d8d9002a864faea0fc5f011a6854a39..f91a2d2d5ae99d88cbd0ac577d209c0fb3d5482b 100644 (file)
--- a/src/ap/wpa_auth_ft.c
+++ b/src/ap/wpa_auth_ft.c
@@ -455,7 +455,7 @@ static int wpa_ft_rrb_lin(const struct tlv_list *tlvs1,
        pos += wpa_ft_tlv_lin(tlvs2, pos, endpos);
        pos += wpa_ft_vlan_lin(vlan, pos, endpos);
 
-       /* sanity check */
+       /* validity check */
        if (pos != endpos) {
                wpa_printf(MSG_ERROR, "FT: Length error building RRB");
                goto err;
@@ -3590,7 +3590,7 @@ int wpa_ft_action_rx(struct wpa_state_machine *sm, const u8 *data, size_t len)
        }
 
        /*
-        * Do some sanity checking on the target AP address (not own and not
+        * Do some validity checking on the target AP address (not own and not
         * broadcast. This could be extended to filter based on a list of known
         * APs in the MD (if such a list were configured).
         */

diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c
index 05fd593494ef3ffbef95b5554432e02e7248e29f..338b47e4e36b4884ba7485ae535ca84b65735f8c 100644 (file)
--- a/src/p2p/p2p_pd.c
+++ b/src/p2p/p2p_pd.c
@@ -1425,7 +1425,7 @@ void p2p_process_prov_disc_resp(struct p2p_data *p2p, const u8 *sa,
                 * Save the reported channel list and operating frequency.
                 * Note that the specification mandates that the responder
                 * should include in the channel list only channels reported by
-                * the initiator, so this is only a sanity check, and if this
+                * the initiator, so this is only a validity check, and if this
                 * fails the flow would continue, although it would probably
                 * fail. Same is true for the operating channel.
                 */

diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c
index 2fe88ac0c5f28b2e7e2932120392c6c439317e63..657de93ae748650417cc5fd9dd170b95da69ade9 100644 (file)
--- a/src/pae/ieee802_1x_kay.c
+++ b/src/pae/ieee802_1x_kay.c
@@ -3057,12 +3057,12 @@ int ieee802_1x_kay_enable_new_info(struct ieee802_1x_kay *kay)
 
 
 /**
- * ieee802_1x_kay_mkpdu_sanity_check -
- * Sanity checks specified in IEEE Std 802.1X-2010, 11.11.2 (Validation of
+ * ieee802_1x_kay_mkpdu_validity_check -
+ * Validity checks specified in IEEE Std 802.1X-2010, 11.11.2 (Validation of
  * MKPDUs)
  */
-static int ieee802_1x_kay_mkpdu_sanity_check(struct ieee802_1x_kay *kay,
-                                            const u8 *buf, size_t len)
+static int ieee802_1x_kay_mkpdu_validity_check(struct ieee802_1x_kay *kay,
+                                              const u8 *buf, size_t len)
 {
        struct ieee8023_hdr *eth_hdr;
        struct ieee802_1x_hdr *eapol_hdr;
@@ -3215,7 +3215,7 @@ static int ieee802_1x_kay_decode_mkpdu(struct ieee802_1x_kay *kay,
 
        wpa_printf(MSG_DEBUG, "KaY: Decode received MKPDU (ifname=%s)",
                   kay->if_name);
-       if (ieee802_1x_kay_mkpdu_sanity_check(kay, buf, len))
+       if (ieee802_1x_kay_mkpdu_validity_check(kay, buf, len))
                return -1;
 
        /* handle basic parameter set */

diff --git a/tests/hwsim/test_fst_config.py b/tests/hwsim/test_fst_config.py
index 5dc404282f3c34ae7e38749eba72f7ea635ceb76..c28786ded853d7634a8197b507dd145a8dae474d 100644 (file)
--- a/tests/hwsim/test_fst_config.py
+++ b/tests/hwsim/test_fst_config.py
@@ -272,7 +272,7 @@ def parse_ies(iehex, el=-1):
     iel = [iehex[i:i + 2] for i in range(0, len(iehex), 2)]
     for i in range(0, len(iel)):
          iel[i] = int(iel[i], 16)
-    # Sanity check
+    # Validity check
     i = 0
     res = []
     while i < len(iel):

diff --git a/tests/hwsim/test_wmediumd.py b/tests/hwsim/test_wmediumd.py
index ad38f03ced824678be9f8b69f54d6cf52e6695f3..8243e7ce37d70acaafe707f6b28b429aae517306 100644 (file)
--- a/tests/hwsim/test_wmediumd.py
+++ b/tests/hwsim/test_wmediumd.py
@@ -1,4 +1,4 @@
-# wmediumd sanity checks
+# wmediumd validity checks
 # Copyright (c) 2015, Intel Deutschland GmbH
 #
 # This software may be distributed under the terms of the BSD license.

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 96667e4d8e1fbdb4683dbf283e071b7727ec7284..f9ce1d2d4515d73f4ab6e9cd4b62263c6eed5a29 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -5924,7 +5924,7 @@ static struct p2ps_provision * p2p_parse_asp_provision_cmd(const char *cmd)
        for (i = 0; p2ps_prov->cpt_priority[i]; i++)
                p2ps_prov->cpt_mask |= p2ps_prov->cpt_priority[i];
 
-       /* force conncap with tstCap (no sanity checks) */
+       /* force conncap with tstCap (no validity checks) */
        pos = os_strstr(cmd, "tstCap=");
        if (pos) {
                role = strtol(pos + 7, NULL, 16);

diff --git a/wpa_supplicant/p2p_supplicant_sd.c b/wpa_supplicant/p2p_supplicant_sd.c
index f8675e68bec489db45b3b3fd237defd3c0b20ca0..b400cbacae616be2f62d34c95634b1016d1e62fe 100644 (file)
--- a/wpa_supplicant/p2p_supplicant_sd.c
+++ b/wpa_supplicant/p2p_supplicant_sd.c
@@ -826,7 +826,7 @@ static void wpas_sd_p2ps_serv_response(struct wpa_supplicant *wpa_s,
                size_t buf_len;
                u8 svc_len;
 
-               /* Sanity check fixed length+svc_str */
+               /* Validity check fixed length+svc_str */
                if (6 >= tlv_end - pos)
                        break;
                svc_len = pos[6];
@@ -854,7 +854,7 @@ static void wpas_sd_p2ps_serv_response(struct wpa_supplicant *wpa_s,
                buf_len = WPA_GET_LE16(pos);
                pos += sizeof(u16);
 
-               /* Sanity check buffer length */
+               /* Validity check buffer length */
                if (buf_len > (unsigned int) (tlv_end - pos))
                        break;