don't use 'open'
authorStefan Metzmacher <metze@samba.org>
Mon, 13 Feb 2012 14:01:40 +0000 (15:01 +0100)
committerStefan Metzmacher <metze@samba.org>
Thu, 10 May 2012 16:41:37 +0000 (18:41 +0200)
source3/smbd/smbXsrv_open.c

index 1172cd8dd7c523e484a8facc1a81112d3981db60..d2c22978146a66b71b238e94d26618bfa110287c 100644 (file)
@@ -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;
 }