Austin English : shell32: Avoid shadowing a parameter.

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


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

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

shell32: Avoid shadowing a parameter.

---

 dlls/shell32/trash.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c
index 99e7d7e..3352c0a 100644
--- a/dlls/shell32/trash.c
+++ b/dlls/shell32/trash.c
@@ -423,10 +423,10 @@ static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN
     else
     {
         /* show only the file name */
-        char *filename = strrchr(original_file_name, '/');
-        if (filename == NULL)
-            filename = original_file_name;
-        MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, data->cFileName, MAX_PATH);
+        char *file = strrchr(original_file_name, '/');
+        if (file == NULL)
+            file = original_file_name;
+        MultiByteToWideChar(CP_UNIXCP, 0, file, -1, data->cFileName, MAX_PATH);
     }
     
     deletion_date = XDG_GetStringValue(parsed, trashinfo_group, "DeletionDate", 0);




More information about the wine-cvs mailing list