summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-02-12 22:21:19 -0800
committerJeremy Allison <jra@samba.org>2010-02-12 22:21:19 -0800
commit10e54fb422d9f1ae6d33e5fabbf8c651b0e57a8c (patch)
treeaf552265d68ae14a4f14d15753653060fe714da0
parentc7f16abc47a2d291d3da95b4c8e654010e36bc0f (diff)
downloadsamba-10e54fb422d9f1ae6d33e5fabbf8c651b0e57a8c.tar.gz
samba-10e54fb422d9f1ae6d33e5fabbf8c651b0e57a8c.tar.bz2
samba-10e54fb422d9f1ae6d33e5fabbf8c651b0e57a8c.zip
Fix warning messages on compile in g_lock.c Volker & Michael please check.
Jeremy.
-rw-r--r--source3/lib/g_lock.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 8a44b22e11..37fb7ce3b8 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -149,10 +149,6 @@ static void g_lock_got_retry(struct messaging_context *msg,
uint32_t msg_type,
struct server_id server_id,
DATA_BLOB *data);
-static void g_lock_timedout(struct tevent_context *ev,
- struct tevent_timer *te,
- struct timeval current_time,
- void *private_data);
static NTSTATUS g_lock_trylock(struct g_lock_ctx *ctx, const char *name,
enum g_lock_type lock_type)
@@ -302,7 +298,9 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
timeout_end = timeval_sum(&time_now, &timeout);
while (true) {
+#ifdef CLUSTER_SUPPORT
fd_set _r_fds;
+#endif
fd_set *r_fds = NULL;
int max_fd = 0;
int ret;
@@ -404,7 +402,9 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
*/
}
+#ifdef CLUSTER_SUPPORT
done:
+#endif
if (!NT_STATUS_IS_OK(status)) {
NTSTATUS unlock_status;
@@ -437,16 +437,6 @@ static void g_lock_got_retry(struct messaging_context *msg,
*pretry = true;
}
-static void g_lock_timedout(struct tevent_context *ev,
- struct tevent_timer *te,
- struct timeval current_time,
- void *private_data)
-{
- bool *ptimedout = (bool *)private_data;
- *ptimedout = true;
- TALLOC_FREE(te);
-}
-
static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
struct server_id pid)
{