Nikolay Sivov : comctl32/listview: Remove duplicated operation (LLVM/Clang) .

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Sat Feb  5 03:35:01 2011 +0300

comctl32/listview: Remove duplicated operation (LLVM/Clang).

---

dlls/comctl32/listview.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index ea2e0cb..a59406f 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -5084,8 +5084,6 @@ enddraw:
 static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nItemCount,
                                             WORD wWidth, WORD wHeight)
 {
-  INT nItemCountPerColumn = 1;
-  INT nColumnCount = 0;
   DWORD dwViewRect = 0;

if (nItemCount == -1)
@@ -5093,6 +5091,9 @@ static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nIte

if (infoPtr->uView == LV_VIEW_LIST)
   {
+    INT nItemCountPerColumn = 1;
+    INT nColumnCount = 0;
+
     if (wHeight == 0xFFFF)
     {
       /* use current height */
@@ -5153,9 +5154,6 @@ static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nIte
     nItemWidth = infoPtr->iconSpacing.cx;
     nItemHeight = infoPtr->iconSpacing.cy;

-    if (nItemCount == -1)
-      nItemCount = infoPtr->nItemCount;
-
     if (wWidth == 0xffff)
       wWidth = infoPtr->rcList.right - infoPtr->rcList.left;