[PATCH 0/2] MR2527: Avoid using the comma operator

[PATCH 1/2] dinput/tests: Use separate statements instead of the comma operator.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/dinput/tests/force_feedback.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c
index 0b7fcb29fa9..696546ee49d 100644
--- a/dlls/dinput/tests/force_feedback.c
+++ b/dlls/dinput/tests/force_feedback.c
@@ -1455,7 +1455,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO
     set_hid_expect( file, NULL, 0 );
     desc = expect_desc;
     desc.dwDuration = INFINITE;
-    desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER,
+    desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER;
     hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD | DIEP_DURATION | DIEP_TRIGGERBUTTON );
     ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#lx\n", hr );
     set_hid_expect( file, expect_update, sizeof(expect_update) );
@@ -1464,7 +1464,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO
     wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */
     desc = expect_desc;
     desc.dwDuration = INFINITE;
-    desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER,
+    desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER;
     hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD | DIEP_DURATION | DIEP_TRIGGERBUTTON );
     ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#lx\n", hr );
     set_hid_expect( file, expect_update, sizeof(expect_update) );

[PATCH 2/2] jscript: Use separate statements instead of the comma operator.

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/jscript/dispex.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index dd91a577159..c3cc41ce782 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -804,7 +804,7 @@ HRESULT gc_run(script_ctx_t *ctx)
                 } while(head);
                 return E_OUTOFMEMORY;
             }
-            chunk = chunk->next, chunk_idx = 0;
+            chunk = chunk->next; chunk_idx = 0;
             chunk->next = NULL;
         }
         chunk->ref[chunk_idx++] = obj->ref;
@@ -901,13 +901,13 @@ HRESULT gc_run(script_ctx_t *ctx)
     free(gc_ctx.next);

/* Restore */
-    chunk = head, chunk_idx = 0;
+    chunk = head; chunk_idx = 0;
     LIST_FOR_EACH_ENTRY(obj, &ctx->objects, jsdisp_t, entry) {
         obj->ref = chunk->ref[chunk_idx++];
         if(chunk_idx == ARRAY_SIZE(chunk->ref)) {
             struct chunk *next = chunk->next;
             free(chunk);
-            chunk = next, chunk_idx = 0;
+            chunk = next; chunk_idx = 0;
         }
     }
     free(chunk);

[PATCH 0/2] MR2527: Avoid using the comma operator - approved

[Rémi Bernon (＠rbernon)]

This merge request was approved by Rémi Bernon.

[PATCH 0/2] MR2527: Avoid using the comma operator - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.