From 8b2a69cf8d5b3fa8b41ac2cbe41336e6e8ae14ab Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Wed, 15 Jan 2020 09:18:32 -0500
Subject: [PATCH] Do a small bit of refactoring to get rid of some copy/paste
 code.

---
 src/calendar.c |  9 +--------
 src/main.c     | 22 ++++++++++++++--------
 src/protos.h   |  1 +
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/calendar.c b/src/calendar.c
index 51890bbc..d2b2754c 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -914,14 +914,7 @@ static void GenerateCalEntries(int col)
     Parser p;
 
 /* Do some initialization first... */
-    ClearGlobalOmits();
-    DestroyOmitContexts();
-    DestroyVars(0);
-    DefaultColorR = -1;
-    DefaultColorG = -1;
-    DefaultColorB = -1;
-    NumTriggered = 0;
-    ClearLastTriggers();
+    PerIterationInit();
 
     r=IncludeFile(InitialFile);
     if (r) {
diff --git a/src/main.c b/src/main.c
index f37727d3..50bf1f14 100644
--- a/src/main.c
+++ b/src/main.c
@@ -127,14 +127,7 @@ int main(int argc, char *argv[])
 	    }
 	}
 	if (Iterations) {
-	    ClearGlobalOmits();
-	    DestroyOmitContexts();
-	    DestroyVars(0);
-	    DefaultColorR = -1;
-	    DefaultColorG = -1;
-	    DefaultColorB = -1;
-	    NumTriggered = 0;
-	    ClearLastTriggers();
+	    PerIterationInit();
 	    JulianToday++;
 	}
     }
@@ -152,6 +145,19 @@ void PurgeEchoLine(char const *fmt, ...)
 
 }
 
+void
+PerIterationInit(void)
+{
+    ClearGlobalOmits();
+    DestroyOmitContexts();
+    DestroyVars(0);
+    DefaultColorR = -1;
+    DefaultColorG = -1;
+    DefaultColorB = -1;
+    NumTriggered = 0;
+    ClearLastTriggers();
+}
+
 /***************************************************************/
 /*                                                             */
 /*  DoReminders                                                */
diff --git a/src/protos.h b/src/protos.h
index 50a29541..28ef3ee8 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -148,3 +148,4 @@ char const *SynthesizeTag(void);
 void ClearLastTriggers(void);
 void SaveLastTrigger(Trigger const *t);
 void SaveLastTimeTrig(TimeTrig const *t);
+void PerIterationInit(void);