More confusing "(BYTE *) & val" style punctuation.

I blame GNU indent, although its confusion is understandable.

[originally from svn r5432]

diff --git a/windows/winpgen.c b/windows/winpgen.c
index d027fc783330915d0e153dfdbd07e359a9bf86a2..a3d97aa809b614b1b98e959620feb57cd132499f 100644 (file)
--- a/windows/winpgen.c
+++ b/windows/winpgen.c
@@ -662,7 +662,7 @@ void load_key_file(HWND hwnd, struct MainDlgState *state,
            dlgret = DialogBoxParam(hinst,
                                    MAKEINTRESOURCE(210),
                                    NULL, PassphraseProc,
-                                   (LPARAM) & pps);
+                                   (LPARAM) &pps);
            if (!dlgret) {
                ret = -2;
                break;

diff --git a/windows/winpgntc.c b/windows/winpgntc.c
index f647eefa9c5b389a7cfc9992ef58980b39268118..3ab81e7b046ee9c70161a4554855469336e1a8b3 100644 (file)
--- a/windows/winpgntc.c
+++ b/windows/winpgntc.c
@@ -128,7 +128,7 @@ int agent_query(void *in, int inlen, void **out, int *outlen,
      * query is required to be synchronous) or CreateThread failed.
      * Either way, we need a synchronous request.
      */
-    id = SendMessage(hwnd, WM_COPYDATA, (WPARAM) NULL, (LPARAM) & cds);
+    id = SendMessage(hwnd, WM_COPYDATA, (WPARAM) NULL, (LPARAM) &cds);
     if (id > 0) {
        retlen = 4 + GET_32BIT(p);
        ret = snewn(retlen, unsigned char);

diff --git a/windows/winstore.c b/windows/winstore.c
index 743283f6093147fe51f6c90eccac6010fcc3d088..2e812c342fab12bbd13a4e3eb7cdbe823fa794ef 100644 (file)
--- a/windows/winstore.c
+++ b/windows/winstore.c
@@ -104,7 +104,7 @@ void write_setting_i(void *handle, const char *key, int value)
 {
     if (handle)
        RegSetValueEx((HKEY) handle, key, 0, REG_DWORD,
-                     (CONST BYTE *) & value, sizeof(value));
+                     (CONST BYTE *) &value, sizeof(value));
 }
 
 void close_settings_w(void *handle)
@@ -157,7 +157,7 @@ int read_setting_i(void *handle, const char *key, int defvalue)
 
     if (!handle ||
        RegQueryValueEx((HKEY) handle, key, 0, &type,
-                       (BYTE *) & val, &size) != ERROR_SUCCESS ||
+                       (BYTE *) &val, &size) != ERROR_SUCCESS ||
        size != sizeof(val) || type != REG_DWORD)
        return defvalue;
     else