From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 13 Feb 2012 14:01:40 +0000 (+0100)
Subject: don't use 'open'
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=a9d146e18f98a6a152830b2ccc87d7c99d3461af;p=metze%2Fsamba%2Fwip.git

don't use 'open'
---

diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index 1172cd8dd7c5..d2c22978146a 100644
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -247,7 +247,7 @@ static NTSTATUS smbXsrv_open_local_allocate_id(struct db_context *db,
 }
 
 struct smbXsrv_open_local_fetch_state {
-	struct smbXsrv_open *open;
+	struct smbXsrv_open *op;
 	NTSTATUS status;
 };
 
@@ -264,7 +264,7 @@ static void smbXsrv_open_local_fetch_parser(TDB_DATA key, TDB_DATA data,
 	}
 
 	memcpy(&ptr, data.dptr, data.dsize);
-	state->open = talloc_get_type_abort(ptr, struct smbXsrv_open);
+	state->op = talloc_get_type_abort(ptr, struct smbXsrv_open);
 	state->status = NT_STATUS_OK;
 }
 
@@ -274,7 +274,7 @@ static NTSTATUS smbXsrv_open_local_lookup(struct smbXsrv_open_table *table,
 					  struct smbXsrv_open **_open)
 {
 	struct smbXsrv_open_local_fetch_state state = {
-		.open = NULL,
+		.op = NULL,
 		.status = NT_STATUS_INTERNAL_ERROR,
 	};
 	uint8_t key_buf[sizeof(uint32_t)];
@@ -302,7 +302,7 @@ static NTSTATUS smbXsrv_open_local_lookup(struct smbXsrv_open_table *table,
 		return state.status;
 	}
 
-	*_open = state.open;
+	*_open = state.op;
 	return NT_STATUS_OK;
 }