From 9ddf75ff32ff126b8075eeb23cc2839fb43ed4f6 Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 9 Feb 2025 09:01:32 +0100
Subject: [PATCH] refactor init and free

---
 src/feierabend.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/feierabend.c b/src/feierabend.c
index dae6b40..233e214 100644
--- a/src/feierabend.c
+++ b/src/feierabend.c
@@ -5,26 +5,33 @@
 #include "break.h"
 #include "config.h"
 
-void init_feierabend(feierabend* fabend)
+#define MAX_WEEKDAY_STR_LENGTH 11
+#define MAX_TIME_STR_LENGTH 7
+
+feierabend* feierabend_init()
 {
+	feierabend* fabend = malloc(sizeof(feierabend));
+
 	fabend->now = malloc(sizeof(time_t));
 	fabend->begin = malloc(sizeof(time_t));
 	fabend->worktime = malloc(sizeof(time_t));
-	fabend->weekday = malloc(sizeof(char) * 11);
-	fabend->timestr = malloc(sizeof(char) * 7);
+	fabend->weekday = malloc(sizeof(char) * MAX_WEEKDAY_STR_LENGTH);
+	fabend->timestr = malloc(sizeof(char) * MAX_TIME_STR_LENGTH);
+
+	return fabend;
 }
 
-void free_feierabend(feierabend* fabend)
+void feierabend_free(feierabend* fabend)
 {
 	free(fabend->now);
-	free(fabend->begin);
-	free(fabend->worktime);
-	free(fabend->weekday);
-	free(fabend->timestr);
 	fabend->now = NULL;
+	free(fabend->begin);
 	fabend->begin = NULL;
+	free(fabend->worktime);
 	fabend->worktime = NULL;
+	free(fabend->weekday);
 	fabend->weekday = NULL;
+	free(fabend->timestr);
 	fabend->timestr = NULL;
 }
 
@@ -35,8 +42,7 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 
-	feierabend* fabend = malloc(sizeof(feierabend));
-	init_feierabend(fabend);
+	feierabend* fabend = feierabend_init();
 
 	printf("Version: %s\n\n", PROJECT_VERSION);
 
@@ -122,7 +128,7 @@ int main(int argc, char* argv[])
 	get_time_str(*fabend->worktime, fabend->timestr);
 	printf("Arbeitzeit bis 10:00 Std: %6s\n", fabend->timestr);
 
-	free_feierabend(fabend);
+	feierabend_free(fabend);
 	free(fabend);
 	fabend = NULL;
 
-- 
2.39.5