From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 15 Jun 2024 07:00:12 +0000 (+0200)
Subject: change localtime_r to localtime
X-Git-Tag: 1.0.0^2~2^2~2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=2616635e2f7a47f61e89f8d6dbe80238adb96eed;p=feierabend.git

change localtime_r to localtime
---

diff --git a/src/main.c b/src/main.c
index 566f412..e6c16df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,9 +24,6 @@ void init_feierabend(feierabend* fabend)
 	fabend->now = malloc(sizeof(time_t));
 	fabend->begin = malloc(sizeof(time_t));
 	fabend->worktime = malloc(sizeof(time_t));
-	fabend->now_tm = malloc(sizeof(struct tm));
-	fabend->begin_tm = malloc(sizeof(struct tm));
-	fabend->work_end_tm = malloc(sizeof(struct tm));
 	fabend->weekday = malloc(sizeof(char) * 11);
 	fabend->timestr = malloc(sizeof(char) * 7);
 }
@@ -36,16 +33,11 @@ void free_feierabend(feierabend* fabend)
 	free(fabend->now);
 	free(fabend->begin);
 	free(fabend->worktime);
-	free(fabend->now_tm);
-	free(fabend->begin_tm);
-	free(fabend->work_end_tm);
 	free(fabend->weekday);
 	free(fabend->timestr);
 	fabend->now = NULL;
 	fabend->begin = NULL;
 	fabend->worktime = NULL;
-	fabend->begin_tm = NULL;
-	fabend->work_end_tm = NULL;
 	fabend->weekday = NULL;
 	fabend->timestr = NULL;
 }
@@ -63,66 +55,62 @@ int main(int argc, char* argv[])
 	printf("Version: %s\n\n", PROJECT_VERSION);
 
 	time(fabend->begin);
-	localtime_r(fabend->begin, fabend->begin_tm);
+	fabend->begin_tm = localtime(fabend->begin);
 	fabend->begin_tm->tm_hour = atoi(argv[1]);
 	fabend->begin_tm->tm_min = atoi(argv[2]);
 	*fabend->begin = timelocal(fabend->begin_tm);
 
 	time(fabend->now);
-	localtime_r(fabend->now, fabend->now_tm);
+	fabend->now_tm = localtime(fabend->now);
 	if (argc == 5) {
 		fabend->now_tm->tm_hour = atoi(argv[3]);
 		fabend->now_tm->tm_min = atoi(argv[4]);
 		*fabend->now = timelocal(fabend->now_tm);
 	}
 	get_weekday(fabend->now_tm->tm_wday, fabend->weekday);
-	printf("%-25s%s %02d.%02d.%04d %02d:%02d %s\n",
+	printf("%-25s%s %02d.%02d.%04d %02d:%02d\n",
 		"Arbeitsbeginn:",
 		fabend->weekday,
 		fabend->begin_tm->tm_mday,
 		fabend->begin_tm->tm_mon + 1,
 		fabend->begin_tm->tm_year + 1900,
 		fabend->begin_tm->tm_hour,
-		fabend->begin_tm->tm_min,
-		fabend->begin_tm->tm_zone);
+		fabend->begin_tm->tm_min);
 
 	printf("\n");
 
-	printf("%-25s%s %02d.%02d.%04d %02d:%02d %s\n",
+	printf("%-25s%s %02d.%02d.%04d %02d:%02d\n",
 		"Aktuelle Zeit:",
 		fabend->weekday,
 		fabend->now_tm->tm_mday,
 		fabend->now_tm->tm_mon + 1,
 		fabend->now_tm->tm_year + 1900,
 		fabend->now_tm->tm_hour,
-		fabend->now_tm->tm_min,
-		fabend->now_tm->tm_zone);
+		fabend->now_tm->tm_min);
 
 	printf("\n");
 
 	*fabend->worktime = get_eight_hour_end_worktime(*fabend->begin);
-	localtime_r(fabend->worktime, fabend->work_end_tm);
-	printf("%-25s%s %02d.%02d.%04d %02d:%02d %s\n",
+	fabend->work_end_tm = localtime(fabend->worktime);
+	printf("%-25s%s %02d.%02d.%04d %02d:%02d\n",
 		"Arbeitsende 8 Std:",
 		fabend->weekday,
 		fabend->work_end_tm->tm_mday,
 		fabend->work_end_tm->tm_mon + 1,
 		fabend->work_end_tm->tm_year + 1900,
 		fabend->work_end_tm->tm_hour,
-		fabend->work_end_tm->tm_min,
-		fabend->work_end_tm->tm_zone);
+		fabend->work_end_tm->tm_min);
 
 	*fabend->worktime = get_ten_hour_end_worktime(*fabend->begin);
-	localtime_r(fabend->worktime, fabend->work_end_tm);
-	printf("%-25s%s %02d.%02d.%04d %02d:%02d %s\n",
+	fabend->work_end_tm = localtime(fabend->worktime);
+	printf("%-25s%s %02d.%02d.%04d %02d:%02d\n",
 		"Arbeitsende 10 Std:",
 		fabend->weekday,
 		fabend->work_end_tm->tm_mday,
 		fabend->work_end_tm->tm_mon + 1,
 		fabend->work_end_tm->tm_year + 1900,
 		fabend->work_end_tm->tm_hour,
-		fabend->work_end_tm->tm_min,
-		fabend->work_end_tm->tm_zone);
+		fabend->work_end_tm->tm_min);
 
 	printf("\n");