hostapd: fix pointer cast warnings

Signed-off-by: Leon M. George <leon@georgemail.eu>

diff --git a/package/network/services/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c
index 5f66b5e92b738a1db9f0da570144a61ffd8aeb88..988cc7011313307596abfc26d1b04ecc609391ab 100644 (file)
--- a/package/network/services/hostapd/src/src/ap/ubus.c
+++ b/package/network/services/hostapd/src/src/ap/ubus.c
@@ -1110,6 +1110,7 @@ static struct ubus_object_type daemon_object_type =
 void hostapd_ubus_add(struct hapd_interfaces *interfaces)
 {
        struct ubus_object *obj = &interfaces->ubus;
+       char *name;
        int name_len;
        int ret;
 
@@ -1119,12 +1120,14 @@ void hostapd_ubus_add(struct hapd_interfaces *interfaces)
        name_len = strlen("hostapd") + 1;
        if (interfaces->name)
                name_len += strlen(interfaces->name) + 1;
-       obj->name = malloc(name_len);
-       strcpy(obj->name, "hostapd");
+
+       name = malloc(name_len);
+       strcpy(name, "hostapd");
        if (interfaces->name) {
-               strcat(obj->name, ".");
-               strcat(obj->name, interfaces->name);
+               strcat(name, ".");
+               strcat(name, interfaces->name);
        }
+       obj->name = name;
 
        obj->type = &daemon_object_type;
        obj->methods = daemon_object_type.methods;

diff --git a/package/network/services/hostapd/src/wpa_supplicant/ubus.c b/package/network/services/hostapd/src/wpa_supplicant/ubus.c
index 9a98979e9a8f3cf49d1b6353095a34f7a3dfaad6..4a4e4697b9991b24755b8e00c19005f966673f58 100644 (file)
--- a/package/network/services/hostapd/src/wpa_supplicant/ubus.c
+++ b/package/network/services/hostapd/src/wpa_supplicant/ubus.c
@@ -320,6 +320,7 @@ static struct ubus_object_type wpas_daemon_object_type =
 void wpas_ubus_add(struct wpa_global *global)
 {
        struct ubus_object *obj = &global->ubus_global;
+       char *name;
        int name_len;
        int ret;
 
@@ -329,15 +330,18 @@ void wpas_ubus_add(struct wpa_global *global)
        name_len = strlen("wpa_supplicant") + 1;
        if (global->params.name)
                name_len += strlen(global->params.name) + 1;
-       obj->name = malloc(name_len);
-       strcpy(obj->name, "wpa_supplicant");
+
+       name = malloc(name_len);
+       strcpy(name, "wpa_supplicant");
 
        if (global->params.name)
        {
-               strcat(obj->name, ".");
-               strcat(obj->name, global->params.name);
+               strcat(name, ".");
+               strcat(name, global->params.name);
        }
 
+       obj->name = name;
+
        obj->type = &wpas_daemon_object_type;
        obj->methods = wpas_daemon_object_type.methods;
        obj->n_methods = wpas_daemon_object_type.n_methods;