Clean up: Replace standard lib methods with os.h ones

Some of the standard lib functions being used directly are redefined in
src/utils/os.h thus providing an abstraction. Change code to use os_*
functions instead of directly using the lib functions.

Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com>
Signed-hostap: Angie Chinchilla <angie.v.chinchilla@intel.com>

diff --git a/wpa_supplicant/dbus/dbus_dict_helpers.c b/wpa_supplicant/dbus/dbus_dict_helpers.c
index 68a9c28a65384df7fbbf59a680a9742ed68a5009..7646bd7cfb0b40f1a113210a5c06d274e9140b2b 100644 (file)
--- a/wpa_supplicant/dbus/dbus_dict_helpers.c
+++ b/wpa_supplicant/dbus/dbus_dict_helpers.c
@@ -1104,5 +1104,5 @@ void wpa_dbus_dict_entry_clear(struct wpa_dbus_dict_entry *entry)
                break;
        }
 
-       memset(entry, 0, sizeof(struct wpa_dbus_dict_entry));
+       os_memset(entry, 0, sizeof(struct wpa_dbus_dict_entry));
 }

diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index c7413aa1275567462b17e1b4942c395c1c23a4f0..138b76f312f737976bf2985f4f3262af96dae006 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -953,7 +953,7 @@ static int wpas_dbus_get_group_obj_path(struct wpa_supplicant *wpa_s,
        if (os_memcmp(ssid->ssid, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN))
                return -1;
 
-       memcpy(group_name, ssid->ssid + P2P_WILDCARD_SSID_LEN, 2);
+       os_memcpy(group_name, ssid->ssid + P2P_WILDCARD_SSID_LEN, 2);
        group_name[2] = '\0';
 
        os_snprintf(group_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index 3514b80d869e09d29c35ac80eabf4148f68d86ee..c950e20fb75f2b9d33ddd646216c880718f3325a 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -253,7 +253,7 @@ dbus_bool_t set_network_properties(struct wpa_supplicant *wpa_s,
 
                if ((os_strcmp(entry.key, "psk") == 0 &&
                     value[0] == '"' && ssid->ssid_len) ||
-                   (strcmp(entry.key, "ssid") == 0 && ssid->passphrase))
+                   (os_strcmp(entry.key, "ssid") == 0 && ssid->passphrase))
                        wpa_config_update_psk(ssid);
                else if (os_strcmp(entry.key, "priority") == 0)
                        wpa_config_update_prio_list(wpa_s->conf);
@@ -547,25 +547,25 @@ DBusMessage * wpas_dbus_handler_create_interface(DBusMessage *message,
        while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
                if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
                        goto error;
-               if (!strcmp(entry.key, "Driver") &&
+               if (!os_strcmp(entry.key, "Driver") &&
                    (entry.type == DBUS_TYPE_STRING)) {
                        driver = os_strdup(entry.str_value);
                        wpa_dbus_dict_entry_clear(&entry);
                        if (driver == NULL)
                                goto error;
-               } else if (!strcmp(entry.key, "Ifname") &&
+               } else if (!os_strcmp(entry.key, "Ifname") &&
                           (entry.type == DBUS_TYPE_STRING)) {
                        ifname = os_strdup(entry.str_value);
                        wpa_dbus_dict_entry_clear(&entry);
                        if (ifname == NULL)
                                goto error;
-               } else if (!strcmp(entry.key, "ConfigFile") &&
+               } else if (!os_strcmp(entry.key, "ConfigFile") &&
                           (entry.type == DBUS_TYPE_STRING)) {
                        confname = os_strdup(entry.str_value);
                        wpa_dbus_dict_entry_clear(&entry);
                        if (confname == NULL)
                                goto error;
-               } else if (!strcmp(entry.key, "BridgeIfname") &&
+               } else if (!os_strcmp(entry.key, "BridgeIfname") &&
                           (entry.type == DBUS_TYPE_STRING)) {
                        bridge_ifname = os_strdup(entry.str_value);
                        wpa_dbus_dict_entry_clear(&entry);

diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
index 60ba7782e0a17ab1ba6ec4dafd8384a3eb74f09d..62930c7a3152ae05e618e3525bbe13e8bf39d60f 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
@@ -45,7 +45,7 @@ static int parse_peer_object_path(char *peer_path, u8 addr[ETH_ALEN])
 
        if (!peer_path)
                return -1;
-       p = strrchr(peer_path, '/');
+       p = os_strrchr(peer_path, '/');
        if (!p)
                return -1;
        p++;

diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index 1d59bcd1d34b35da1e336431dcb5cbb340f5b040..21a44833e89e0add76e5952f8f870756d81b1551 100644 (file)
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -1880,7 +1880,7 @@ static int wpa_ctrl_command_sta(struct wpa_ctrl *ctrl, char *cmd,
                return -1;
        }
        len = sizeof(buf) - 1;
-       ret = wpa_ctrl_request(ctrl, cmd, strlen(cmd), buf, &len,
+       ret = wpa_ctrl_request(ctrl, cmd, os_strlen(cmd), buf, &len,
                               wpa_cli_msg_cb);
        if (ret == -2) {
                printf("'%s' command timed out.\n", cmd);
@@ -1891,7 +1891,7 @@ static int wpa_ctrl_command_sta(struct wpa_ctrl *ctrl, char *cmd,
        }
 
        buf[len] = '\0';
-       if (memcmp(buf, "FAIL", 4) == 0)
+       if (os_memcmp(buf, "FAIL", 4) == 0)
                return -1;
        printf("%s", buf);
 
@@ -2425,7 +2425,7 @@ static int wpa_ctrl_command_p2p_peer(struct wpa_ctrl *ctrl, char *cmd,
        if (ctrl_conn == NULL)
                return -1;
        len = sizeof(buf) - 1;
-       ret = wpa_ctrl_request(ctrl, cmd, strlen(cmd), buf, &len,
+       ret = wpa_ctrl_request(ctrl, cmd, os_strlen(cmd), buf, &len,
                               wpa_cli_msg_cb);
        if (ret == -2) {
                printf("'%s' command timed out.\n", cmd);
@@ -2436,7 +2436,7 @@ static int wpa_ctrl_command_p2p_peer(struct wpa_ctrl *ctrl, char *cmd,
        }
 
        buf[len] = '\0';
-       if (memcmp(buf, "FAIL", 4) == 0)
+       if (os_memcmp(buf, "FAIL", 4) == 0)
                return -1;
 
        pos = buf;