From 16eb6092b005ca554890efe876bb0ef2ba78ebeb Mon Sep 17 00:00:00 2001
From: OBATA Akio <obache@outlook.com>
Date: Sat, 16 Oct 2021 17:07:37 +0900
Subject: [PATCH] dtcm: prevent to use `NULL` as a Tick type

Tick (aka time_t) shall be an integer type, not a pointer.
Change to use `0` instead of `NULL`.
---
 cde/programs/dtcm/server/reclotick.c  | 12 ++++++------
 cde/programs/dtcm/server/relasttick.c |  6 +++---
 cde/programs/dtcm/server/renexttick.c |  4 ++--
 cde/programs/dtcm/server/reprevtick.c |  4 ++--
 cde/programs/dtcm/server/reutil.c     |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cde/programs/dtcm/server/reclotick.c b/cde/programs/dtcm/server/reclotick.c
index a76831fcd..2aa203580 100644
--- a/cde/programs/dtcm/server/reclotick.c
+++ b/cde/programs/dtcm/server/reclotick.c
@@ -81,12 +81,12 @@ ClosestTick(
 				 real_start_time,
 				 target_time = _target_time;
 
-	if (!re) return (Tick)NULL;
+	if (!re) return (Tick)0;
 
 	FillInRepeatEvent(start_time, re);
 
 	if (!(*res = InitRepeatEventState(re)))
-		return (Tick)NULL;
+		return (Tick)0;
 
 	if (target_time < start_time)
 		target_time = start_time;
@@ -131,7 +131,7 @@ ClosestTick(
 	    (re->re_end_date && re->re_end_date < closest_tick)) { 
 		free (*res);
 		*res = NULL;
-		return (Tick)NULL;
+		return (Tick)0;
 	}
 
 	/*
@@ -351,7 +351,7 @@ DoWeek(
 	/* Make sure the start time is on the first real event slot. */
 	if (_target_time) {
 		if (!(unused = InitRepeatEventState(re)))
-			return (Tick)NULL;
+			return (Tick)0;
 		start_time = DoWeek(0, _start_time, re, unused);
 		free(unused);
 		if (_target_time < start_time)
@@ -676,7 +676,7 @@ DoYearByMonth(
 	/* Make sure the start time is on the first real event slot. */
 	if (_target_time) {
 		if (!(unused = InitRepeatEventState(re)))
-			return (Tick)NULL;
+			return (Tick)0;
 		start_time = DoYearByMonth(0, _start_time, re, unused);
 		free(unused);
 		if (_target_time < start_time)
@@ -780,7 +780,7 @@ DoYearByDay(
 	/* Make sure the start time is on the first real event slot. */
 	if (_target_time) {
 		if (!(unused = InitRepeatEventState(re)))
-			return (Tick)NULL;
+			return (Tick)0;
 		start_time = DoYearByDay(0, _start_time, re, unused);
 		free(unused);
 		if (_target_time < start_time)
diff --git a/cde/programs/dtcm/server/relasttick.c b/cde/programs/dtcm/server/relasttick.c
index dae6478b0..89747dcbe 100644
--- a/cde/programs/dtcm/server/relasttick.c
+++ b/cde/programs/dtcm/server/relasttick.c
@@ -63,7 +63,7 @@ LastTick(
 {
 	Tick 			 last_time;
 
-	if (!re) return (Tick)NULL;
+	if (!re) return (Tick)0;
 
 	if (re->re_duration == RE_INFINITY) return EOT;
 
@@ -101,7 +101,7 @@ DoMinute(
 	const Tick		 start_time,
 	const RepeatEvent	*re)
 {
-	return (Tick)NULL;
+	return (Tick)0;
 }
 
 static Tick
@@ -404,7 +404,7 @@ DoYearByMonth(
 			}
 		}
 		/* No months have a day that can be used */
-		return ((Tick)NULL); 
+		return (Tick)0;
 	}
 
 	last_time2 = mktime(start_tm);
diff --git a/cde/programs/dtcm/server/renexttick.c b/cde/programs/dtcm/server/renexttick.c
index f3c7a57cd..9f19e9007 100644
--- a/cde/programs/dtcm/server/renexttick.c
+++ b/cde/programs/dtcm/server/renexttick.c
@@ -79,7 +79,7 @@ NextTick(
 {
 	Tick 			 next_time;
 
-	if (!re) return (Tick)NULL;
+	if (!re) return (Tick)0;
 
 	FillInRepeatEvent(start_time, re);
 
@@ -126,7 +126,7 @@ DoMinute(
 	const RepeatEvent	*re,
 	RepeatEventState	*res)
 {
-	return (Tick)NULL;
+	return (Tick)0;
 }
 
 static Tick
diff --git a/cde/programs/dtcm/server/reprevtick.c b/cde/programs/dtcm/server/reprevtick.c
index 3f2fc2916..c62bd8ded 100644
--- a/cde/programs/dtcm/server/reprevtick.c
+++ b/cde/programs/dtcm/server/reprevtick.c
@@ -92,7 +92,7 @@ PrevTick(
 	Tick 			 next_time;
 	Tick			 _start_time;
 
-        if (!re) return (Tick)NULL;
+        if (!re) return (Tick)0;
 
 	if (!start_time)
         	FillInRepeatEvent(cur_time, re);
@@ -148,7 +148,7 @@ DoMinute(
 	const RepeatEvent	*re,
 	RepeatEventState	*res)
 {
-	return (Tick)NULL;
+	return (Tick)0;
 }
 
 static Tick
diff --git a/cde/programs/dtcm/server/reutil.c b/cde/programs/dtcm/server/reutil.c
index 1d7f3520f..34fbe2df2 100644
--- a/cde/programs/dtcm/server/reutil.c
+++ b/cde/programs/dtcm/server/reutil.c
@@ -230,7 +230,7 @@ WeekNumberToDay(
          * month.
          */
         if (date_tm->tm_mon != initial_month_number)
-                return ((Tick)NULL);
+                return (Tick)0;
 
         return (_date);
 }