daysmask_set_range

Author: minichma

src/libical/icalrecur.c

@@ -1134,12 +1134,11 @@ static void daysmask_set_range(unsigned long days[], int fromDayIncl, int untilD
     int fromBitIdx = fromDayIncl + ICAL_YEARDAYS_MASK_OFFSET;
     int untilBitIdx = untilDayExcl + ICAL_YEARDAYS_MASK_OFFSET;
 
-    for (
-        int word_idx = fromBitIdx / BITS_PER_LONG;
-        word_idx < (int)((untilBitIdx + BITS_PER_LONG - 1) / BITS_PER_LONG);
-        word_idx++) {
-        int lowerBitIdxIncl = MAX(0, fromBitIdx - (int)(word_idx * BITS_PER_LONG));
-        int upperBitIdxExcl = MIN((int)BITS_PER_LONG, untilBitIdx - (int)(word_idx * BITS_PER_LONG));
+    for (int word_idx = fromBitIdx / BITS_PER_LONG;
+         word_idx < (int)((untilBitIdx + BITS_PER_LONG - 1) / BITS_PER_LONG);
+         word_idx++) {
+        int lowerBitIdxIncl = (fromBitIdx <= (int)(word_idx * BITS_PER_LONG)) ? 0 : fromBitIdx - (int)(word_idx * BITS_PER_LONG);
+        int upperBitIdxExcl = (untilBitIdx >= (int)((word_idx + 1) * BITS_PER_LONG)) ? (int)BITS_PER_LONG : (int)(untilBitIdx - (int)((word_idx + 1) * BITS_PER_LONG));
 
         unsigned long mask = (unsigned long)-1;
         if (lowerBitIdxIncl > 0)