sane.ds: Remove unneeded address-of operators from array name

Andrew Talbot andrew.talbot at talbotville.com
Wed Nov 2 17:29:07 CDT 2011


Changelog:
    sane.ds: Remove unneeded address-of operators from array name.

diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c
index d57376e..7efefa7 100644
--- a/dlls/sane.ds/ui.c
+++ b/dlls/sane.ds/ui.c
@@ -516,7 +516,7 @@ exit:
 BOOL DoScannerUI(void)
 {
     HDC hdc;
-    PROPSHEETPAGEW psp[10];
+    PROPSHEETPAGEW psp[10] = { { 0 } };
     int page_count= 0;
     PROPSHEETHEADERW psh;
     int index = 1;
@@ -528,7 +528,6 @@ BOOL DoScannerUI(void)
 
     hdc = GetDC(0);
 
-    memset(&psp,0,sizeof(psp));
     rc = psane_control_option(activeDS.deviceHandle, 0, SANE_ACTION_GET_VALUE,
             &optcount, NULL);
     if (rc != SANE_STATUS_GOOD)
@@ -585,7 +584,7 @@ BOOL DoScannerUI(void)
     psh.pszCaption = szCaption;
     psh.nPages = page_count;
     psh.u2.nStartPage = 0;
-    psh.u3.ppsp = (LPCPROPSHEETPAGEW) &psp;
+    psh.u3.ppsp = (LPCPROPSHEETPAGEW)psp;
     psh.pfnCallback = PropSheetProc;
 
     psrc = PropertySheetW(&psh);



More information about the wine-patches mailing list