summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-30 10:45:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:02 -0500
commit964487e4b9925a85b707eafcaff6aca8bd54a846 (patch)
tree7a731852ca122393be3b45deb330817fcc29c46f /source4/libcli
parenta326d6dba91637d80c5f88fa450fe2e02ba445cb (diff)
downloadsamba-964487e4b9925a85b707eafcaff6aca8bd54a846.tar.gz
samba-964487e4b9925a85b707eafcaff6aca8bd54a846.tar.bz2
samba-964487e4b9925a85b707eafcaff6aca8bd54a846.zip
r12602: fix compiler warning
metze (This used to be commit 82d5bdb1e73dd203cfaf83fdb46c485d212d5c65)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/wrepl/winsrepl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/libcli/wrepl/winsrepl.c b/source4/libcli/wrepl/winsrepl.c
index b67138f1dd..0409607aa9 100644
--- a/source4/libcli/wrepl/winsrepl.c
+++ b/source4/libcli/wrepl/winsrepl.c
@@ -193,8 +193,8 @@ failed:
*/
struct wrepl_socket *wrepl_socket_merge(TALLOC_CTX *mem_ctx,
struct event_context *event_ctx,
- struct socket_context *socket,
- struct packet_context *packet)
+ struct socket_context *sock,
+ struct packet_context *pack)
{
struct wrepl_socket *wrepl_socket;
@@ -204,7 +204,7 @@ struct wrepl_socket *wrepl_socket_merge(TALLOC_CTX *mem_ctx,
wrepl_socket->event.ctx = talloc_reference(wrepl_socket, event_ctx);
if (wrepl_socket->event.ctx == NULL) goto failed;
- wrepl_socket->sock = socket;
+ wrepl_socket->sock = sock;
talloc_steal(wrepl_socket, wrepl_socket->sock);
@@ -218,7 +218,7 @@ struct wrepl_socket *wrepl_socket_merge(TALLOC_CTX *mem_ctx,
goto failed;
}
- wrepl_socket->packet = packet;
+ wrepl_socket->packet = pack;
talloc_steal(wrepl_socket, wrepl_socket->packet);
packet_set_private(wrepl_socket->packet, wrepl_socket);
packet_set_socket(wrepl_socket->packet, wrepl_socket->sock);