felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Communicate errors back for bad OMITFUNCs.

Browse Source
This commit is contained in:
David F. Skoll
2008-08-30 22:10:06 -04:00
parent 0ab977fa05
commit 6845e72fd5
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/dorem.c
View File

@@ -814,7 +814,7 @@ int ShouldTriggerReminder(Trigger *t, TimeTrig *tim, int jul)
if (!IsOmitted(jul, t->localomit, t->omitfunc)) r--;
}
if (iter > max) {
/* TODO: Somehow communicate error back to caller!! */
Eprint("Delta: Bad OMITFUNC? %s", ErrMsg[E_CANT_TRIG]);
return 0;
}
}
@@ -1024,7 +1024,10 @@ static int ShouldTriggerBasedOnWarn(Trigger *t, int jul)
break;
}
}
if (iter > max) return 0;
if (iter > max) {
Eprint("Delta: Bad OMITFUNC? %s", ErrMsg[E_CANT_TRIG]);
return 0;
}
if (j == JulianToday) return 1;
}
}

7
src/trigger.c
View File

@@ -304,6 +304,7 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
}
if (iter > MaxSatIter) {
/* omitfunc must have returned "true" too often */
*err = E_CANT_TRIG;
return -2;
}
}
@@ -336,6 +337,10 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
simple--;
if (!IsOmitted(simple, trig->localomit, trig->omitfunc)) mod--;
}
if (iter > max) {
*err = E_CANT_TRIG;
return -2;
}
}
}
@@ -358,6 +363,7 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
simple--;
}
if (iter > MaxSatIter) {
*err = E_CANT_TRIG;
return -2;
}
}
@@ -372,6 +378,7 @@ static int GetNextTriggerDate(Trigger *trig, int start, int *err, int *nextstart
simple++;
}
if (iter > MaxSatIter) {
*err = E_CANT_TRIG;
return -2;
}
}