summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-03 19:11:38 +1000
committerGünther Deschner <gd@samba.org>2011-05-03 14:38:29 +0200
commitf08250eb55930bd8613c7ebe1a0de2fb0ccbff30 (patch)
treeafdd9c15b6ff37bfadf36421bcf974fe8f178590
parentcd9a7c143c87fa0f1fda8a6c9b331b21ae6148a2 (diff)
downloadsamba-f08250eb55930bd8613c7ebe1a0de2fb0ccbff30.tar.gz
samba-f08250eb55930bd8613c7ebe1a0de2fb0ccbff30.tar.bz2
samba-f08250eb55930bd8613c7ebe1a0de2fb0ccbff30.zip
s3-ctdb Fix duplicate function name due to packet -> ctdb_packet rename.
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--source3/include/ctdb_packet.h2
-rw-r--r--source3/lib/ctdb_packet.c2
-rw-r--r--source3/lib/ctdbd_conn.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/ctdb_packet.h b/source3/include/ctdb_packet.h
index 267a98825f..026b23f90e 100644
--- a/source3/include/ctdb_packet.h
+++ b/source3/include/ctdb_packet.h
@@ -38,7 +38,7 @@ NTSTATUS ctdb_packet_fd_read(struct ctdb_packet_context *ctx);
/*
* Sync read, wait for the next chunk
*/
-NTSTATUS ctdb_packet_fd_read_sync(struct ctdb_packet_context *ctx, int timeout);
+NTSTATUS ctdb_packet_fd_read_sync_timeout(struct ctdb_packet_context *ctx, int timeout);
/*
* Handle an incoming ctdb_packet:
diff --git a/source3/lib/ctdb_packet.c b/source3/lib/ctdb_packet.c
index 772fcec421..03be372f19 100644
--- a/source3/lib/ctdb_packet.c
+++ b/source3/lib/ctdb_packet.c
@@ -105,7 +105,7 @@ NTSTATUS ctdb_packet_fd_read(struct ctdb_packet_context *ctx)
return NT_STATUS_OK;
}
-NTSTATUS ctdb_packet_fd_read_sync(struct ctdb_packet_context *ctx, int timeout)
+NTSTATUS ctdb_packet_fd_read_sync_timeout(struct ctdb_packet_context *ctx, int timeout)
{
int res, revents;
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 0b053ecb70..9c353baba4 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -336,7 +336,7 @@ static NTSTATUS ctdb_packet_fd_read_sync(struct ctdb_packet_context *ctx)
if (timeout == 0) {
timeout = -1;
}
- return ctdb_packet_fd_read_sync(ctx, timeout);
+ return ctdb_packet_fd_read_sync_timeout(ctx, timeout);
}
/*