diff --git a/src/calendar.c b/src/calendar.c index 60f90fc7..edc72c3e 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -1770,7 +1770,7 @@ static int DoCalRem(ParsePtr p, int col) DBufInit(&raw_buf); /* Parse the trigger date and time */ - if ( (r=ParseRem(p, &trig, &tim, 1)) ) { + if ( (r=ParseRem(p, &trig, &tim)) ) { FreeTrig(&trig); return r; } diff --git a/src/dorem.c b/src/dorem.c index eb5f383d..253086f3 100644 --- a/src/dorem.c +++ b/src/dorem.c @@ -25,7 +25,7 @@ #include "protos.h" #include "expr.h" -static int ParseTimeTrig (ParsePtr s, TimeTrig *tim, int save_in_globals); +static int ParseTimeTrig (ParsePtr s, TimeTrig *tim); static int ParseLocalOmit (ParsePtr s, Trigger *t); static int ParseScanFrom (ParsePtr s, Trigger *t, int type); static int ParsePriority (ParsePtr s, Trigger *t); @@ -63,7 +63,7 @@ int DoRem(ParsePtr p) DBufInit(&buf); /* Parse the trigger date and time */ - if ( (r=ParseRem(p, &trig, &tim, 1)) ) { + if ( (r=ParseRem(p, &trig, &tim)) ) { FreeTrig(&trig); return r; } @@ -220,7 +220,7 @@ int DoRem(ParsePtr p) /* trigger structure. */ /* */ /***************************************************************/ -int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals) +int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim) { register int r; DynamicBuffer buf; @@ -311,10 +311,6 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals) trig->m = m; trig->d = d; tim->ttime = (tok.val % MINUTES_PER_DAY); - if (save_in_globals) { - LastTriggerTime = tim->ttime; - SaveLastTimeTrig(tim); - } break; case T_WkDay: @@ -351,14 +347,14 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals) DBufFree(&buf); if (tim->ttime != NO_TIME) return E_TIME_TWICE; tim->ttime = tok.val; - r = ParseTimeTrig(s, tim, save_in_globals); + r = ParseTimeTrig(s, tim); if (r) return r; trig->duration_days = ComputeTrigDuration(tim); break; case T_At: DBufFree(&buf); - r=ParseTimeTrig(s, tim, save_in_globals); + r=ParseTimeTrig(s, tim); if (r) return r; trig->duration_days = ComputeTrigDuration(tim); break; @@ -518,9 +514,6 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals) } else { tim->duration = NO_TIME; } - if (save_in_globals) { - SaveLastTimeTrig(tim); - } trig->duration_days = ComputeTrigDuration(tim); break; default: @@ -604,7 +597,7 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals) /* ParseTimeTrig - parse the AT part of a timed reminder */ /* */ /***************************************************************/ -static int ParseTimeTrig(ParsePtr s, TimeTrig *tim, int save_in_globals) +static int ParseTimeTrig(ParsePtr s, TimeTrig *tim) { Token tok; int r; @@ -639,11 +632,6 @@ static int ParseTimeTrig(ParsePtr s, TimeTrig *tim, int save_in_globals) default: if (tim->ttime == NO_TIME) return E_EXPECT_TIME; - /* Save trigger time in global variable */ - if (save_in_globals) { - LastTriggerTime = tim->ttime; - SaveLastTimeTrig(tim); - } PushToken(DBufValue(&buf), s); DBufFree(&buf); return OK; diff --git a/src/funcs.c b/src/funcs.c index b9bca840..45f58964 100644 --- a/src/funcs.c +++ b/src/funcs.c @@ -3498,7 +3498,7 @@ FEvalTrig(func_info *info) CreateParser(ARGSTR(0), &p); p.allownested = 0; - r = ParseRem(&p, &trig, &tim, 0); + r = ParseRem(&p, &trig, &tim); if (r) { DestroyParser(&p); return r; @@ -3557,7 +3557,7 @@ FMultiTrig(func_info *info) for (i=0; i= IF_NEST) return E_NESTED_IF; if (ShouldIgnoreLine()) syndrome = IF_TRUE | BEFORE_ELSE; else { - if ( (r=ParseRem(p, &trig, &tim, 1)) ) return r; + if ( (r=ParseRem(p, &trig, &tim)) ) return r; if (trig.typ != NO_TYPE) return E_PARSE_ERR; dse = ComputeTrigger(trig.scanfrom, &trig, &tim, &r, 1); if (r) { diff --git a/src/protos.h b/src/protos.h index dc6d7624..c1cfcdff 100644 --- a/src/protos.h +++ b/src/protos.h @@ -37,7 +37,7 @@ char const *CalendarTime (int tim, int duration); int DoRem (ParsePtr p); int DoFlush (ParsePtr p); void DoExit (ParsePtr p); -int ParseRem (ParsePtr s, Trigger *trig, TimeTrig *tim, int save_in_globals); +int ParseRem (ParsePtr s, Trigger *trig, TimeTrig *tim); int TriggerReminder (ParsePtr p, Trigger *t, TimeTrig *tim, int dse, int is_queued, DynamicBuffer *output); int ShouldTriggerReminder (Trigger *t, TimeTrig *tim, int dse, int *err); int DoSubst (ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int dse, int mode);