r7856: fixed warning of 'methods' shadowed variable

(This used to be commit c435843c66a5dcc003d157374529c3c5ac733e36)

diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index b87f9abe892d9fae352b9841774d6b929545b185..3607400155841201b1d78a887784972e8768ec6d 100644 (file)
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -40,7 +40,7 @@ static const struct resolve_method {
        struct composite_context *(*send_fn)(struct nbt_name *, struct event_context *);
        NTSTATUS (*recv_fn)(struct composite_context *, TALLOC_CTX *, const char **);
 
-} methods[] = {
+} resolve_methods[] = {
        { "bcast", resolve_name_bcast_send,  resolve_name_bcast_recv },
        { "wins",  resolve_name_wins_send,   resolve_name_wins_recv },
        { "host",  resolve_name_host_send,   resolve_name_host_recv }
@@ -54,9 +54,9 @@ static const struct resolve_method *find_method(const char *name)
 {
        int i;
        if (name == NULL) return NULL;
-       for (i=0;i<ARRAY_SIZE(methods);i++) {
-               if (strcasecmp(name, methods[i].name) == 0) {
-                       return &methods[i];
+       for (i=0;i<ARRAY_SIZE(resolve_methods);i++) {
+               if (strcasecmp(name, resolve_methods[i].name) == 0) {
+                       return &resolve_methods[i];
                }
        }
        return NULL;