mirror of
git://git.yoctoproject.org/poky
synced 2026-07-19 19:51:52 +00:00
e6f91350d1
(From OE-Core rev: a71a527ecf198e2e3712ed9608b74e78e09ece0f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
From 38ddd0d1863f83e8ec545d0160bdf00bbb5569ba Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Mon, 19 Apr 2021 23:29:10 +0200
|
|
Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on
|
|
32bit arches with 64bit time_t
|
|
|
|
Use intmax_t to print time_t
|
|
|
|
time_t is platform dependent and some of architectures e.g.
|
|
x32, riscv32, arc use 64bit time_t even while they are 32bit
|
|
architectures, therefore directly using integer printf formats will not
|
|
work portably, use intmax_t to typecast time_t into printf family of
|
|
functions
|
|
|
|
Upstream-Status: Submitted [via email to mark@klomp.org,elfutils-devel@sourceware.org]
|
|
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
---
|
|
debuginfod/debuginfod-client.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
|
|
index c875ee6..df9737d 100644
|
|
--- a/debuginfod/debuginfod-client.c
|
|
+++ b/debuginfod/debuginfod-client.c
|
|
@@ -231,15 +231,15 @@ debuginfod_config_cache(char *config_path,
|
|
if (fd < 0)
|
|
return -errno;
|
|
|
|
- if (dprintf(fd, "%ld", cache_config_default_s) < 0)
|
|
+ if (dprintf(fd, "%jd", (intmax_t)cache_config_default_s) < 0)
|
|
return -errno;
|
|
}
|
|
|
|
- long cache_config;
|
|
+ int cache_config;
|
|
FILE *config_file = fopen(config_path, "r");
|
|
if (config_file)
|
|
{
|
|
- if (fscanf(config_file, "%ld", &cache_config) != 1)
|
|
+ if (fscanf(config_file, "%d", &cache_config) != 1)
|
|
cache_config = cache_config_default_s;
|
|
fclose(config_file);
|
|
}
|
|
@@ -272,7 +272,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
|
|
if (fd < 0)
|
|
return -errno;
|
|
|
|
- if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0)
|
|
+ if (dprintf(fd, "%jd", (intmax_t)cache_clean_default_interval_s) < 0)
|
|
return -errno;
|
|
|
|
/* init max age config file. */
|
|
@@ -280,7 +280,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path)
|
|
&& (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
|
|
return -errno;
|
|
|
|
- if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0)
|
|
+ if (dprintf(fd, "%jd", (intmax_t)cache_default_max_unused_age_s) < 0)
|
|
return -errno;
|
|
|
|
return 0;
|