summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-24 00:04:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:43 -0500
commit21d6a163a30d2eac0e048c8ebc02cb48213ac543 (patch)
tree96016e76466b43243d43a83141e2de118cf5595d /source4
parentacd04c9281252f4fe47c7127da13ea25be703c7c (diff)
downloadsamba-21d6a163a30d2eac0e048c8ebc02cb48213ac543.tar.gz
samba-21d6a163a30d2eac0e048c8ebc02cb48213ac543.tar.bz2
samba-21d6a163a30d2eac0e048c8ebc02cb48213ac543.zip
r7856: fixed warning of 'methods' shadowed variable
(This used to be commit c435843c66a5dcc003d157374529c3c5ac733e36)
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/resolve/resolve.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index b87f9abe89..3607400155 100644
--- 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;