fix localtime_r and tv_usec casting

baresip · Feb 7, 2024 · 17e7b54 · 17e7b54
1 parent 2f29d38
commit 17e7b54
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/fmt/text2pcap.c b/src/fmt/text2pcap.c
@@ -9,9 +9,9 @@
 int re_text2pcap(struct re_printf *pf, struct re_text2pcap *pcap)
 {
 	struct timeval tv;
-	time_t t      = time(NULL);
-	struct tm *tm = localtime(&t);
-	char ts[10]   = {0};
+	time_t t = time(NULL);
+	struct tm tm;
+	char ts[10] = {0};
 
 	if (!pcap)
 		return EINVAL;
@@ -20,11 +20,12 @@ int re_text2pcap(struct re_printf *pf, struct re_text2pcap *pcap)
 	if (!buf)
 		return EINVAL;
 
+	localtime_r(&t, &tm);
 	gettimeofday(&tv, NULL);
-	strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+	strftime(ts, sizeof(ts), "%H:%M:%S", &tm);
 
 	re_hprintf(pf, "%s %s.%06ld 000000", pcap->in ? "I" : "O", ts,
-		   tv.tv_usec);
+		   (long int)tv.tv_usec);
 
 	size_t sz = mbuf_get_left(pcap->mb);
 	for (size_t i = 0; i < sz; i++) {