Joris Huizer : rpcrt4: Reduce scope of variable (Clang).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3312d63119ac0a05daf89fc44bcc2c54c2d63a4b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3312d63119ac0a05daf89fc44b...

Author: Joris Huizer 
Date:   Fri Feb  4 12:38:45 2011 +0100

rpcrt4: Reduce scope of variable (Clang).

---

dlls/rpcrt4/ndr_marshall.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index db8be60..1e99c2e 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -919,7 +919,6 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
   }

if (pointer_needs_unmarshaling) {
-    unsigned char *base_ptr_val = *pPointer;
     unsigned char **current_ptr = pPointer;
     if (pStubMsg->IsClient) {
       TRACE("client\n");
@@ -932,7 +931,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
       if (!fMustAlloc) {
         if (pSrcPointer) {
           TRACE("setting *pPointer to %p\n", pSrcPointer);
-          *pPointer = base_ptr_val = pSrcPointer;
+          *pPointer = pSrcPointer;
         } else
           fMustAlloc = TRUE;
       }
@@ -945,7 +944,6 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
       if (attr & RPC_FC_P_DEREF) {
         fMustAlloc = TRUE;
       } else {
-        base_ptr_val = NULL;
         *current_ptr = NULL;
       }
     }
@@ -955,7 +953,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,

if (attr & RPC_FC_P_DEREF) {
       if (fMustAlloc) {
-        base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *));
+        unsigned char *base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *));
         *pPointer = base_ptr_val;
         current_ptr = (unsigned char **)base_ptr_val;
       } else