s4:libcli/resolve: avoid some const warnings
authorStefan Metzmacher <metze@samba.org>
Thu, 27 Feb 2014 08:52:36 +0000 (09:52 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 2 Apr 2014 07:03:43 +0000 (09:03 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/libcli/resolve/nbtlist.c
source4/libcli/resolve/wins.c

index 64d72bcc51aa4f2a93d8ed94b040c7c6b2eace30..13f38ff8ea57a5cd15f66f6ef867056b14556710 100644 (file)
@@ -111,7 +111,7 @@ struct composite_context *resolve_name_nbtlist_send(TALLOC_CTX *mem_ctx,
                                                    uint32_t flags,
                                                    uint16_t port,
                                                    struct nbt_name *name, 
-                                                   const char **address_list,
+                                                   const char * const *address_list,
                                                    struct interface *ifaces,
                                                    uint16_t nbt_port,
                                                    int nbt_timeout,
index a52b99a23ef30ebecc080a682c93b676db1fb6c0..541d3fe5db2e627e0168855d2687fac0b1b48d16 100644 (file)
@@ -27,7 +27,7 @@
 #include "lib/socket/netif.h"
 
 struct resolve_wins_data {
-       const char **address_list;
+       char **address_list;
        struct interface *ifaces;
        uint16_t nbt_port;
        int nbt_timeout;
@@ -47,7 +47,8 @@ struct composite_context *resolve_name_wins_send(
        struct resolve_wins_data *wins_data = talloc_get_type(userdata, struct resolve_wins_data);
        if (wins_data->address_list == NULL) return NULL;
        return resolve_name_nbtlist_send(mem_ctx, event_ctx, flags, port, name,
-                                        wins_data->address_list, wins_data->ifaces,
+                                        (const char * const *)wins_data->address_list,
+                                        wins_data->ifaces,
                                         wins_data->nbt_port, wins_data->nbt_timeout,
                                         false, true);
 }
@@ -66,7 +67,7 @@ NTSTATUS resolve_name_wins_recv(struct composite_context *c,
 bool resolve_context_add_wins_method(struct resolve_context *ctx, const char **address_list, struct interface *ifaces, uint16_t nbt_port, int nbt_timeout)
 {
        struct resolve_wins_data *wins_data = talloc(ctx, struct resolve_wins_data);
-       wins_data->address_list = (const char **)str_list_copy(wins_data, address_list);
+       wins_data->address_list = str_list_copy(wins_data, address_list);
        wins_data->ifaces = talloc_reference(wins_data, ifaces);
        wins_data->nbt_port = nbt_port;
        wins_data->nbt_timeout = nbt_timeout;