rpcrt4: Avoid shadowing pProcHeader (try 2)
André Hentschel
nerv at dawncrow.de
Fri Apr 27 10:13:44 CDT 2012
try2: simpler variable name
---
dlls/rpcrt4/ndr_es.c | 6 +++---
dlls/rpcrt4/ndr_stubless.c | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c
index cd0967d..7381181 100644
--- a/dlls/rpcrt4/ndr_es.c
+++ b/dlls/rpcrt4/ndr_es.c
@@ -348,9 +348,9 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu
if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
{
- const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
- stack_size = pProcHeader->stack_size;
- pEsMsg->ProcNumber = pProcHeader->proc_num;
+ const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
+ stack_size = header_rpc->stack_size;
+ pEsMsg->ProcNumber = header_rpc->proc_num;
pFormat += sizeof(NDR_PROC_HEADER_RPC);
}
else
diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 88aae7a..db41a1a 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -626,9 +626,9 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma
if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
{
- const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
- stack_size = pProcHeader->stack_size;
- procedure_number = pProcHeader->proc_num;
+ const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
+ stack_size = header_rpc->stack_size;
+ procedure_number = header_rpc->proc_num;
pFormat += sizeof(NDR_PROC_HEADER_RPC);
}
else
@@ -1231,8 +1231,8 @@ LONG WINAPI NdrStubCall2(
if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
{
- const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
- stack_size = pProcHeader->stack_size;
+ const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
+ stack_size = header_rpc->stack_size;
pFormat += sizeof(NDR_PROC_HEADER_RPC);
}
@@ -1519,9 +1519,9 @@ LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING
if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS)
{
- const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
- async_call_data->stack_size = pProcHeader->stack_size;
- procedure_number = pProcHeader->proc_num;
+ const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0];
+ async_call_data->stack_size = header_rpc->stack_size;
+ procedure_number = header_rpc->proc_num;
pFormat += sizeof(NDR_PROC_HEADER_RPC);
}
else
--
Best Regards, André Hentschel
More information about the wine-patches
mailing list