[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  10e54fb... Fix warning messages on compile in g_lock.c Volker & Michael please check.
      from  c7f16ab... Fix error in docs. Should be milliseconds, not microseconds.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 10e54fb422d9f1ae6d33e5fabbf8c651b0e57a8c
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 12 22:21:19 2010 -0800

    Fix warning messages on compile in g_lock.c Volker & Michael please check.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/g_lock.c |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 8a44b22..37fb7ce 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)
 {


-- 
Samba Shared Repository