sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-04 09:44:20 +03:00
Code Activity

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

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison
2010-02-12 22:21:19 -08:00
parent c7f16abc47
commit 10e54fb422
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source3/lib/g_lock.c
View File

@@ -149,10 +149,6 @@ static void g_lock_got_retry(struct messaging_context *msg,
uint32_t msg_type, uint32_t msg_type,
struct server_id server_id, struct server_id server_id,
DATA_BLOB *data); 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, static NTSTATUS g_lock_trylock(struct g_lock_ctx *ctx, const char *name,
enum g_lock_type lock_type) 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); timeout_end = timeval_sum(&time_now, &timeout);
while (true) { while (true) {
#ifdef CLUSTER_SUPPORT
fd_set _r_fds; fd_set _r_fds;
#endif
fd_set *r_fds = NULL; fd_set *r_fds = NULL;
int max_fd = 0; int max_fd = 0;
int ret; int ret;
@@ -404,7 +402,9 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
*/ */
} }
#ifdef CLUSTER_SUPPORT
done: done:
#endif
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
NTSTATUS unlock_status; NTSTATUS unlock_status;
@@ -437,16 +437,6 @@ static void g_lock_got_retry(struct messaging_context *msg,
*pretry = true; *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, static NTSTATUS g_lock_force_unlock(struct g_lock_ctx *ctx, const char *name,
struct server_id pid) struct server_id pid)
{ {