Merge against latest 2.3

2019-09-17 13:28:42 +02:00
parent 04ba756cd9 573d305b58
commit 9e83c5d10f
247 changed files with 35085 additions and 42445 deletions
@@ -328,7 +328,7 @@ char * getSwitchPositionName(char * dest, swsrc_t idx)
  }
 #else
 #define IDX_TRIMS_IN_STR_VSWITCHES   (1)
-#define IDX_ON_IN_STR_VSWITCHES      (IDX_TRIMS_IN_STR_VSWITCHES+SWSRC_LAST_TRIM-SWSRC_FIRST_TRIM+1)
+#define IDX_ON_IN_STR_VSWITCHES      (IDX_TRIMS_IN_STR_VSWITCHES + SWSRC_LAST_TRIM - SWSRC_FIRST_TRIM + 1)
  if (idx <= SWSRC_LAST_SWITCH) {
    div_t swinfo = switchInfo(idx);
    s = getSwitchName(s, idx);