From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 2 Nov 2021 17:16:28 +0000 (+0100)
Subject: cleanup: use the ctrltimet helper
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee9b9a81785c90f7db1f57c1a2084020ef94da54;p=thirdparty%2Fmlmmj.git

cleanup: use the ctrltimet helper
---

diff --git a/src/mlmmj-maintd.c b/src/mlmmj-maintd.c
index 0d0b29d0..a101746a 100644
--- a/src/mlmmj-maintd.c
+++ b/src/mlmmj-maintd.c
@@ -138,14 +138,9 @@ int clean_moderation(struct mlmmj_list *list)
 {
 
 	time_t modreqlife = 0;
-	char *modreqlifestr;
 	int fd;
 
-	modreqlifestr = ctrlvalue(list, "modreqlife");
-	if(modreqlifestr) {
-		modreqlife = atol(modreqlifestr);
-		myfree(modreqlifestr);
-	}
+	modreqlife = ctrltimet(list, "modreqlife");
 	if(modreqlife == 0)
 		modreqlife = MODREQLIFE;
 
@@ -209,7 +204,6 @@ int resend_queue(struct mlmmj_list *list, const char *mlmmjsend)
 	struct dirent *dp;
 	char *mailname, *fromname, *toname, *reptoname, *from, *to, *repto;
 	char *ch, *dirname = concatstr(2, list->dir, "/queue/");
-	char *bouncelifestr;
 	pid_t childpid, pid;
 	struct stat st;
 	int fromfd, tofd, fd, status, err = 0;
@@ -311,11 +305,7 @@ int resend_queue(struct mlmmj_list *list, const char *mlmmjsend)
 		}
 
 		/* before we try again, check and see if it's old */
-		bouncelifestr = ctrlvalue(list, "bouncelife");
-		if(bouncelifestr) {
-			bouncelife = atol(bouncelifestr);
-			myfree(bouncelifestr);
-		}
+		bouncelife = ctrltimet(list, "bouncelife");
 		if(bouncelife == 0)
 			bouncelife = BOUNCELIFE;
 
@@ -661,7 +651,6 @@ int unsub_bouncers(struct mlmmj_list *list, const char *mlmmjunsub)
 	DIR *bouncedir;
 	char *dirname = concatstr(2, list->dir, "/bounce/");
 	char *probefile, *address, *a, *firstbounce, *bouncedata;
-	char *bouncelifestr;
 	struct dirent *dp;
 	struct stat st;
 	pid_t pid, childpid;
@@ -683,13 +672,8 @@ int unsub_bouncers(struct mlmmj_list *list, const char *mlmmjunsub)
 
 	myfree(dirname);
 
-	bouncelifestr = ctrlvalue(list, "bouncelife");
-	if(bouncelifestr) {
-		bouncelife = atol(bouncelifestr);
-		myfree(bouncelifestr);
-	}
-	
-	if(bouncelife == 0)
+	bouncelife = ctrltimet(list, "bouncelife");
+	if (bouncelife == 0)
 		bouncelife = BOUNCELIFE;
 
 	while((dp = readdir(bouncedir)) != NULL) {
@@ -807,7 +791,7 @@ int unsub_bouncers(struct mlmmj_list *list, const char *mlmmjunsub)
 int run_digests(struct mlmmj_list *list, const char *mlmmjsend)
 {
 	char *lasttimestr, *lastindexstr, *lastissuestr;
-	char *digestintervalstr, *digestmaxmailsstr;
+	char *digestmaxmailsstr;
 	char *s1, *s2;
 	time_t digestinterval, t, lasttime;
 	long digestmaxmails, lastindex, index, lastissue;
@@ -817,13 +801,9 @@ int run_digests(struct mlmmj_list *list, const char *mlmmjsend)
 		return 0;
 	}
 	
-	digestintervalstr = ctrlvalue(list, "digestinterval");
-	if (digestintervalstr) {
-		digestinterval = (time_t)atol(digestintervalstr);
-		myfree(digestintervalstr);
-	} else {
+	digestinterval = ctrltimet(list, "digestinterval");
+	if (digestinterval == 0)
 		digestinterval = (time_t)DIGESTINTERVAL;
-	}
 
 	digestmaxmailsstr = ctrlvalue(list, "digestmaxmails");
 	if (digestmaxmailsstr) {