Austin English : mapi32: Avoid shadowing a parameter.

Alexandre Julliard julliard at winehq.org
Wed Mar 9 11:12:51 CST 2011


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

Author: Austin English <austinenglish at gmail.com>
Date:   Wed Mar  9 01:07:32 2011 -0800

mapi32: Avoid shadowing a parameter.

---

 dlls/mapi32/sendmail.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c
index e115649..89daf0f 100644
--- a/dlls/mapi32/sendmail.c
+++ b/dlls/mapi32/sendmail.c
@@ -298,7 +298,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
 
         if (IMAPISession_PrepareForm(session, NULL, msg, &token) == S_OK)
         {
-            ULONG access = 0, status = 0, flags = 0, pc = 0;
+            ULONG access = 0, status = 0, message_flags = 0, pc = 0;
             ULONG pT[2] = {1, PR_MSG_STATUS};
 
             /* Retrieve message status, flags, access rights and class */
@@ -313,7 +313,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
 
             if (IMessage_GetProps(msg, (LPSPropTagArray) pT, 0, &pc, &props) == S_OK)
             {
-                flags = props->Value.ul;
+                message_flags = props->Value.ul;
                 MAPIFreeBuffer(props);
             }
 
@@ -332,7 +332,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
                 /* Show the message form (edit window) */
 
                 ret = IMAPISession_ShowForm(session, 0, msg_store, draft_folder, NULL,
-                                            token, NULL, 0, status, flags, access,
+                                            token, NULL, 0, status, message_flags, access,
                                             props->Value.lpszA);
 
                 switch (ret)




More information about the wine-cvs mailing list