r12602: fix compiler warning
authorStefan Metzmacher <metze@samba.org>
Fri, 30 Dec 2005 10:45:43 +0000 (10:45 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:49:02 +0000 (13:49 -0500)
metze

source/libcli/wrepl/winsrepl.c

index b67138f1dd24bd50bb234f8055f353bb5fde4e47..0409607aa95f85a0a8fcfc5c6cd7c6b2af76dc6f 100644 (file)
@@ -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);