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

Suppress some spurious debugging output when we use "-dt" with a TZ reminder.

Browse Source
This commit is contained in:
Dianne Skoll
2025-10-11 11:56:48 -04:00
parent f07a6d1bed
commit f726b09fc6
7 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/calendar.c
View File

@@ -2080,7 +2080,7 @@ static int DoCalRem(ParsePtr p, int col)
} }
/* Adjust trigger date/time to time zone */ /* Adjust trigger date/time to time zone */
dse = AdjustTriggerForTimeZone(&trig, dse, &tim); dse = AdjustTriggerForTimeZone(&trig, dse, &tim, 1);
/* Add to global OMITs if so indicated */ /* Add to global OMITs if so indicated */
if (trig.addomit) { if (trig.addomit) {

6
src/dorem.c
View File

@@ -35,7 +35,7 @@ static int ComputeTrigDuration(TimeTrig const *t);
static int CalledEnterTimezone = 0; static int CalledEnterTimezone = 0;
int AdjustTriggerForTimeZone(Trigger *trig, int dse, TimeTrig *tim) int AdjustTriggerForTimeZone(Trigger *trig, int dse, TimeTrig *tim, int debug_ok)
{ {
int y, m, d, hour, minute; int y, m, d, hour, minute;
int r; int r;
@@ -59,7 +59,7 @@ int AdjustTriggerForTimeZone(Trigger *trig, int dse, TimeTrig *tim)
/* Adjust eventstart also */ /* Adjust eventstart also */
trig->eventstart = dse * MINUTES_PER_DAY + tim->ttime; trig->eventstart = dse * MINUTES_PER_DAY + tim->ttime;
SaveAllTriggerInfo(trig, tim, dse, tim->ttime, 1); SaveAllTriggerInfo(trig, tim, dse, tim->ttime, 1);
if (DebugFlag & DB_PRTTRIG) { if (debug_ok && (DebugFlag & DB_PRTTRIG)) {
fprintf(ErrFp, "%s(%s): Trig(tz_adj %s) = %s, %d %s, %d AT %02d:%02d", fprintf(ErrFp, "%s(%s): Trig(tz_adj %s) = %s, %d %s, %d AT %02d:%02d",
GetCurrentFilename(), line_range(LineNoStart, LineNo), trig->tz, GetCurrentFilename(), line_range(LineNoStart, LineNo), trig->tz,
get_day_name(dse % 7), tm.tm_mday, get_month_name(tm.tm_mon), get_day_name(dse % 7), tm.tm_mday, get_month_name(tm.tm_mon),
@@ -534,7 +534,7 @@ int DoRem(ParsePtr p)
} }
/* Adjust trigger date/time to time zone */ /* Adjust trigger date/time to time zone */
dse = AdjustTriggerForTimeZone(&trig, dse, &tim); dse = AdjustTriggerForTimeZone(&trig, dse, &tim, 1);
/* Add to global OMITs if so indicated */ /* Add to global OMITs if so indicated */
if (trig.addomit) { if (trig.addomit) {

4
src/funcs.c
View File

@@ -4621,7 +4621,7 @@ FEvalTrig(func_info *info)
RetVal.type = DATE_TYPE; RetVal.type = DATE_TYPE;
RETVAL = dse; RETVAL = dse;
} else { } else {
dse = AdjustTriggerForTimeZone(&trig, dse, &tim); dse = AdjustTriggerForTimeZone(&trig, dse, &tim, 1);
RetVal.type = DATETIME_TYPE; RetVal.type = DATETIME_TYPE;
RETVAL = (MINUTES_PER_DAY * dse) + tim.ttime; RETVAL = (MINUTES_PER_DAY * dse) + tim.ttime;
} }
@@ -4736,7 +4736,7 @@ FTrig(func_info *info)
FreeTrig(&trig); FreeTrig(&trig);
continue; continue;
} }
dse = AdjustTriggerForTimeZone(&trig, dse, &tim); dse = AdjustTriggerForTimeZone(&trig, dse, &tim, 1);
if (ShouldTriggerReminder(&trig, &tim, dse, &r)) { if (ShouldTriggerReminder(&trig, &tim, dse, &r)) {
LastTrig = dse; LastTrig = dse;
RETVAL = dse; RETVAL = dse;

2
src/main.c
View File

@@ -1307,7 +1307,7 @@ int DoIfTrig(ParsePtr p)
push_if(0, 0); push_if(0, 0);
} else { } else {
if (dse >= 0) { if (dse >= 0) {
dse = AdjustTriggerForTimeZone(&trig, dse, &tim); dse = AdjustTriggerForTimeZone(&trig, dse, &tim, 1);
} }
if (ShouldTriggerReminder(&trig, &tim, dse, &err)) { if (ShouldTriggerReminder(&trig, &tim, dse, &err)) {
push_if(1, 0); push_if(1, 0);

2
src/protos.h
View File

@@ -300,7 +300,7 @@ int system_to_stderr(char const *cmd);
int system1(char const *cmd); int system1(char const *cmd);
int tz_set_tz (char const *tz); int tz_set_tz (char const *tz);
int tz_convert(int year, int month, int day, int hour, int minute, char const *src_tz, char const *tgt_tz, struct tm *tm); int tz_convert(int year, int month, int day, int hour, int minute, char const *src_tz, char const *tgt_tz, struct tm *tm);
int AdjustTriggerForTimeZone(Trigger *trig, int dse, TimeTrig *tim); int AdjustTriggerForTimeZone(Trigger *trig, int dse, TimeTrig *tim, int debug_ok);
void EnterTimezone(char const *tz); void EnterTimezone(char const *tz);
void ExitTimezone(char const *tz); void ExitTimezone(char const *tz);
int warning_level(char const *which); int warning_level(char const *which);

2
src/trigger.c
View File

@@ -623,7 +623,7 @@ int ComputeTriggerNoAdjustDuration(int today, Trigger *trig, TimeTrig const *tim
int new_result; int new_result;
int force_retry = 0; int force_retry = 0;
ExitTimezone(trig->tz); ExitTimezone(trig->tz);
new_result = AdjustTriggerForTimeZone(trig, result, &copy); new_result = AdjustTriggerForTimeZone(trig, result, &copy, 0);
if (trig->scanfrom == NO_SCANFROM && new_result < DSEToday) { if (trig->scanfrom == NO_SCANFROM && new_result < DSEToday) {
force_retry = 1; force_retry = 1;
} }

10
tests/tz.cmp
View File

@@ -54,26 +54,18 @@ evaltrig("Wednesday at 23:00 TZ Europe/Amsterdam") => 2025-09-03@17:00
evaltrig("Wednesday at 23:00 TZ America/Los_Angele"...) => 2025-09-04@02:00 evaltrig("Wednesday at 23:00 TZ America/Los_Angele"...) => 2025-09-04@02:00
evaltrig("Wednesday TZ Europe/Amsterdam") => TZ specified for non-timed reminder evaltrig("Wednesday TZ Europe/Amsterdam") => TZ specified for non-timed reminder
-stdin-(11): evaltrig(): TZ specified for non-timed reminder -stdin-(11): evaltrig(): TZ specified for non-timed reminder
trig("Mon at 00:00 TZ Australia/Sydney", "Tue at 00:00 TZ America/Toronto", "Wed at 00:00 TZ Europe/Amsterdam", "Thu at 00:00 TZ America/Los_Angeles", "Fri at 00:00 TZ Australia/Sydney", "Sat at 00:00 TZ Australia/Sydney", "Sun at 00:00 TZ Australia/Sydney", "at 14:42") => -stdin-(14:21): Trig(tz_adj Australia/Sydney) = Sunday, 31 August, 2025 AT 10:00 trig("Mon at 00:00 TZ Australia/Sydney", "Tue at 00:00 TZ America/Toronto", "Wed at 00:00 TZ Europe/Amsterdam", "Thu at 00:00 TZ America/Los_Angeles", "Fri at 00:00 TZ Australia/Sydney", "Sat at 00:00 TZ Australia/Sydney", "Sun at 00:00 TZ Australia/Sydney", "at 14:42") => -stdin-(14:21): Trig = Monday, 8 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Sunday, 7 September, 2025 AT 10:00 -stdin-(14:21): Trig(tz_adj Australia/Sydney) = Sunday, 7 September, 2025 AT 10:00
-stdin-(14:21): Trig = Monday, 8 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Sunday, 7 September, 2025 AT 10:00
-stdin-(14:21): Trig(tz_adj America/Toronto) = Tuesday, 2 September, 2025 AT 00:00
-stdin-(14:21): Trig = Tuesday, 2 September, 2025 AT 00:00 -stdin-(14:21): Trig = Tuesday, 2 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj America/Toronto) = Tuesday, 2 September, 2025 AT 00:00 -stdin-(14:21): Trig(tz_adj America/Toronto) = Tuesday, 2 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj Europe/Amsterdam) = Tuesday, 2 September, 2025 AT 18:00
-stdin-(14:21): Trig = Wednesday, 3 September, 2025 AT 00:00 -stdin-(14:21): Trig = Wednesday, 3 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj Europe/Amsterdam) = Tuesday, 2 September, 2025 AT 18:00 -stdin-(14:21): Trig(tz_adj Europe/Amsterdam) = Tuesday, 2 September, 2025 AT 18:00
-stdin-(14:21): Trig(tz_adj America/Los_Angeles) = Thursday, 4 September, 2025 AT 03:00
-stdin-(14:21): Trig = Thursday, 4 September, 2025 AT 00:00 -stdin-(14:21): Trig = Thursday, 4 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj America/Los_Angeles) = Thursday, 4 September, 2025 AT 03:00 -stdin-(14:21): Trig(tz_adj America/Los_Angeles) = Thursday, 4 September, 2025 AT 03:00
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Thursday, 4 September, 2025 AT 10:00
-stdin-(14:21): Trig = Friday, 5 September, 2025 AT 00:00 -stdin-(14:21): Trig = Friday, 5 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Thursday, 4 September, 2025 AT 10:00 -stdin-(14:21): Trig(tz_adj Australia/Sydney) = Thursday, 4 September, 2025 AT 10:00
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Friday, 5 September, 2025 AT 10:00
-stdin-(14:21): Trig = Saturday, 6 September, 2025 AT 00:00 -stdin-(14:21): Trig = Saturday, 6 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Friday, 5 September, 2025 AT 10:00 -stdin-(14:21): Trig(tz_adj Australia/Sydney) = Friday, 5 September, 2025 AT 10:00
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Saturday, 6 September, 2025 AT 10:00
-stdin-(14:21): Trig = Sunday, 7 September, 2025 AT 00:00 -stdin-(14:21): Trig = Sunday, 7 September, 2025 AT 00:00
-stdin-(14:21): Trig(tz_adj Australia/Sydney) = Saturday, 6 September, 2025 AT 10:00 -stdin-(14:21): Trig(tz_adj Australia/Sydney) = Saturday, 6 September, 2025 AT 10:00
-stdin-(14:21): Trig = Monday, 1 September, 2025 AT 14:42 -stdin-(14:21): Trig = Monday, 1 September, 2025 AT 14:42