From 93cc6f1854d28c1cc0acdad5175ffb5209a04b4c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 13 Jun 2024 06:30:18 +0200
Subject: Merging upstream version 32+20240611.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 tools/depmod.c | 4 ++--
 tools/kmod.c   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/depmod.c b/tools/depmod.c
index 06618fa..8e9e2d1 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -2638,8 +2638,8 @@ static int depmod_output(struct depmod *depmod, FILE *out)
 			int mode = 0644;
 			int fd;
 
-			snprintf(tmp, sizeof(tmp), "%s.%i.%li.%li", itr->name, getpid(),
-					tv.tv_usec, tv.tv_sec);
+			snprintf(tmp, sizeof(tmp), "%s.%i.%lli.%lli", itr->name, getpid(),
+					(long long)tv.tv_usec, (long long)tv.tv_sec);
 			fd = openat(dfd, tmp, flags, mode);
 			if (fd < 0) {
 				ERR("openat(%s, %s, %o, %o): %m\n",
diff --git a/tools/kmod.c b/tools/kmod.c
index 1015575..e1a73be 100644
--- a/tools/kmod.c
+++ b/tools/kmod.c
@@ -24,6 +24,7 @@
 #include <string.h>
 
 #include <shared/util.h>
+#include <shared/missing.h>
 
 #include <libkmod/libkmod.h>
 
-- 
cgit v1.2.3