From 17da60068da2bfbc1a3d1ea53a6f7717125bad94 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 9 Jan 2022 20:33:32 +0300
Subject: [PATCH] os2joystick: fix -Wsequence-point issues.
---
src/joystick/os2/SDL_os2joystick.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/joystick/os2/SDL_os2joystick.c b/src/joystick/os2/SDL_os2joystick.c
index b92c16bbc64..5d39df84945 100644
--- a/src/joystick/os2/SDL_os2joystick.c
+++ b/src/joystick/os2/SDL_os2joystick.c
@@ -708,10 +708,18 @@ static int joyGetEnv(struct _joycfg * joydata)
while (*joyenv == ' ' && *joyenv != 0) joyenv++; /* jump spaces... */
/* If the string name starts with '... get if fully */
- if (*joyenv == '\'') joyenv += joyGetData(++joyenv,joydata->name,'\'',sizeof(joydata->name));
+ if (*joyenv == '\'') {
+ joyenv++;
+ joyenv += joyGetData(joyenv,joydata->name,'\'',sizeof(joydata->name));
+ }
/* If not, get it until the next space */
- else if (*joyenv == '\"') joyenv += joyGetData(++joyenv,joydata->name,'\"',sizeof(joydata->name));
- else joyenv += joyGetData(joyenv,joydata->name,' ',sizeof(joydata->name));
+ else if (*joyenv == '\"') {
+ joyenv++;
+ joyenv += joyGetData(joyenv,joydata->name,'\"',sizeof(joydata->name));
+ }
+ else {
+ joyenv += joyGetData(joyenv,joydata->name, ' ',sizeof(joydata->name));
+ }
/* Now get the number of axes */
while (*joyenv == ' ' && *joyenv != 0) joyenv++; /* jump spaces... */